[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 1221 commits - chart2/inc chart2/prj chart2/qa chart2/source chart2/util sc/addin scaddins/prj scaddins/source sccomp/prj sccomp/source sc/inc sc/prj sc/qa sc/sdi sc/source sc/uiconfig sc/util sc/workben
Kohei Yoshida
kohei at kemper.freedesktop.org
Thu Feb 10 22:39:58 PST 2011
chart2/inc/makefile.mk | 8
chart2/inc/pch/precompiled_chart2.hxx | 2
chart2/prj/build.lst | 2
chart2/prj/d.lst | 4
chart2/qa/makefile.mk | 14
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 27
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 25
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 3
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 25
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 79
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 25
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 26
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 26
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 114 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 6
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 25
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 116 -
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 5
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 25
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 15
chart2/source/controller/chartapiwrapper/makefile.mk | 60
chart2/source/controller/chartcontroller.component | 56
chart2/source/controller/dialogs/DataBrowser.cxx | 2
chart2/source/controller/dialogs/DialogModel.cxx | 15
chart2/source/controller/dialogs/DialogModel.hxx | 4
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 1
chart2/source/controller/dialogs/dlg_ChartType.src | 2
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 2
chart2/source/controller/dialogs/dlg_DataEditor.src | 2
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 2
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src | 2
chart2/source/controller/dialogs/dlg_InsertDataLabel.src | 2
chart2/source/controller/dialogs/dlg_InsertErrorBars.src | 1
chart2/source/controller/dialogs/dlg_InsertLegend.src | 2
chart2/source/controller/dialogs/dlg_InsertTitle.src | 2
chart2/source/controller/dialogs/dlg_InsertTrendline.src | 2
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 14
chart2/source/controller/dialogs/dlg_View3D.src | 3
chart2/source/controller/dialogs/hidother.src | 3
chart2/source/controller/dialogs/makefile.mk | 16
chart2/source/controller/dialogs/tp_3D_SceneAppearance.src | 4
chart2/source/controller/dialogs/tp_3D_SceneGeometry.src | 9
chart2/source/controller/dialogs/tp_3D_SceneIllumination.src | 13
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 10
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.src | 8
chart2/source/controller/dialogs/tp_AxisPositions.src | 16
chart2/source/controller/dialogs/tp_ChartType.cxx | 14
chart2/source/controller/dialogs/tp_ChartType.src | 16
chart2/source/controller/dialogs/tp_DataLabel.src | 4
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.src | 9
chart2/source/controller/dialogs/tp_ErrorBars.src | 1
chart2/source/controller/dialogs/tp_LegendPosition.src | 1
chart2/source/controller/dialogs/tp_Location.src | 2
chart2/source/controller/dialogs/tp_PointGeometry.src | 1
chart2/source/controller/dialogs/tp_PolarOptions.src | 4
chart2/source/controller/dialogs/tp_RangeChooser.src | 7
chart2/source/controller/dialogs/tp_Scale.src | 13
chart2/source/controller/dialogs/tp_SeriesToAxis.src | 11
chart2/source/controller/dialogs/tp_Trendline.src | 1
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src | 1
chart2/source/controller/drawinglayer/makefile.mk | 14
chart2/source/controller/inc/ConfigurationAccess.hxx | 2
chart2/source/controller/inc/HelpIds.hrc | 247 +-
chart2/source/controller/inc/dlg_ObjectProperties.hxx | 4
chart2/source/controller/itemsetwrapper/makefile.mk | 38
chart2/source/controller/main/ChartController.cxx | 29
chart2/source/controller/main/ChartController_TextEdit.cxx | 1
chart2/source/controller/main/ChartController_Tools.cxx | 1
chart2/source/controller/main/ChartController_Window.cxx | 153 -
chart2/source/controller/main/ChartWindow.cxx | 2
chart2/source/controller/main/DrawCommandDispatch.hrc | 49
chart2/source/controller/main/ShapeController.cxx | 21
chart2/source/controller/main/StatusBarCommandDispatch.cxx | 3
chart2/source/controller/main/UndoCommandDispatch.cxx | 9
chart2/source/controller/main/_serviceregistration_controller.cxx | 7
chart2/source/controller/makefile.mk | 12
chart2/source/inc/OPropertySet.hxx | 29
chart2/source/inc/exports.dxp | 1
chart2/source/model/chartmodel.component | 150 +
chart2/source/model/filter/makefile.mk | 14
chart2/source/model/inc/DataSeries.hxx | 4
chart2/source/model/main/Axis.cxx | 137 -
chart2/source/model/main/BaseCoordinateSystem.cxx | 94 -
chart2/source/model/main/ChartModel.cxx | 13
chart2/source/model/main/ChartModel.hxx | 19
chart2/source/model/main/DataPoint.cxx | 70
chart2/source/model/main/DataPoint.hxx | 7
chart2/source/model/main/DataSeries.cxx | 110 -
chart2/source/model/main/Diagram.cxx | 109 -
chart2/source/model/main/FormattedString.cxx | 95 -
chart2/source/model/main/GridProperties.cxx | 100 -
chart2/source/model/main/Legend.cxx | 118 -
chart2/source/model/main/PageBackground.cxx | 107 -
chart2/source/model/main/StockBar.cxx | 105 -
chart2/source/model/main/Title.cxx | 139 -
chart2/source/model/main/Wall.cxx | 107 -
chart2/source/model/main/_serviceregistration_model.cxx | 10
chart2/source/model/makefile.mk | 56
chart2/source/model/template/AreaChartTypeTemplate.cxx | 96 -
chart2/source/model/template/BarChartTypeTemplate.cxx | 98 -
chart2/source/model/template/BubbleChartType.cxx | 93 -
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 94 -
chart2/source/model/template/CandleStickChartType.cxx | 104 -
chart2/source/model/template/ChartType.cxx | 55
chart2/source/model/template/ColumnChartType.cxx | 103 -
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 96 -
chart2/source/model/template/LineChartType.cxx | 104 -
chart2/source/model/template/LineChartTypeTemplate.cxx | 104 -
chart2/source/model/template/NetChartType.cxx | 52
chart2/source/model/template/PieChartType.cxx | 96 -
chart2/source/model/template/PieChartTypeTemplate.cxx | 103 -
chart2/source/model/template/ScatterChartType.cxx | 104 -
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 104 -
chart2/source/model/template/StockChartTypeTemplate.cxx | 101 -
chart2/source/model/template/makefile.mk | 70
chart2/source/tools/CommonConverters.cxx | 1
chart2/source/tools/DiagramHelper.cxx | 134 +
chart2/source/tools/ErrorBar.cxx | 109 -
chart2/source/tools/ExplicitCategoriesProvider.cxx | 4
chart2/source/tools/InternalDataProvider.cxx | 14
chart2/source/tools/RegressionCurveModel.cxx | 93 -
chart2/source/tools/RegressionEquation.cxx | 123 -
chart2/source/tools/WrappedPropertySet.cxx | 56
chart2/source/tools/_serviceregistration_tools.cxx | 7
chart2/source/tools/charttools.component | 92 +
chart2/source/tools/makefile.mk | 8
chart2/source/view/axes/VCartesianAxis.cxx | 109 +
chart2/source/view/charttypes/makefile.mk | 26
chart2/source/view/chartview.component | 34
chart2/source/view/main/ChartItemPool.cxx | 2
chart2/source/view/main/_serviceregistration_view.cxx | 7
chart2/source/view/main/makefile.mk | 16
chart2/source/view/makefile.mk | 68
chart2/util/makefile.mk | 14
sc/addin/datefunc/makefile.mk | 12
sc/addin/inc/addin.h | 7
sc/addin/makefile.mk | 2
sc/addin/rot13/makefile.mk | 10
sc/inc/addincol.hxx | 7
sc/inc/address.hxx | 6
sc/inc/callform.hxx | 6
sc/inc/cellsuno.hxx | 7
sc/inc/charthelper.hxx | 11
sc/inc/clipparam.hxx | 12
sc/inc/document.hxx | 8
sc/inc/docuno.hxx | 3
sc/inc/dpcachetable.hxx | 1
sc/inc/dpobject.hxx | 1
sc/inc/fmtuno.hxx | 6
sc/inc/helpids.h | 692 +++++++
sc/inc/makefile.mk | 8
sc/inc/pch/precompiled_sc.hxx | 2
sc/inc/sc.hrc | 382 ----
sc/inc/scabstdlg.hxx | 6
sc/inc/sccommands.h | 336 +++
sc/inc/scfuncs.hrc | 290 ---
sc/inc/scmod.hxx | 1
sc/inc/unonames.hxx | 1
sc/inc/viewuno.hxx | 3
sc/prj/build.lst | 8
sc/prj/d.lst | 3
sc/qa/complex/calcPreview/TestDocument.java | 39
sc/qa/complex/calcPreview/ViewForwarder.java | 501 +++--
sc/qa/complex/calcPreview/makefile.mk | 140 -
sc/qa/complex/cellRanges/CheckXCellRangesQuery.java | 157 +
sc/qa/complex/cellRanges/makefile.mk | 62
sc/qa/complex/dataPilot/CheckDataPilot.java | 198 +-
sc/qa/complex/dataPilot/_XDataPilotDescriptor.java | 464 +++++
sc/qa/complex/dataPilot/_XDataPilotTable.java | 135 +
sc/qa/complex/dataPilot/_XNamed.java | 159 +
sc/qa/complex/dataPilot/_XPropertySet.java | 631 ++++++
sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java | 631 ------
sc/qa/complex/dataPilot/interfaceTests/beans/makefile.mk | 6
sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java | 147 -
sc/qa/complex/dataPilot/interfaceTests/container/makefile.mk | 6
sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java | 449 ----
sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java | 133 -
sc/qa/complex/dataPilot/interfaceTests/sheet/makefile.mk | 6
sc/qa/complex/dataPilot/makefile.mk | 45
sc/qa/complex/sc/CalcRTL.java | 221 +-
sc/qa/complex/sc/makefile.mk | 44
sc/sdi/tabvwsh.sdi | 1
sc/source/core/data/clipparam.cxx | 10
sc/source/core/data/column3.cxx | 2
sc/source/core/data/conditio.cxx | 2
sc/source/core/data/docpool.cxx | 14
sc/source/core/data/documen3.cxx | 11
sc/source/core/data/documen5.cxx | 33
sc/source/core/data/documen8.cxx | 11
sc/source/core/data/documen9.cxx | 10
sc/source/core/data/document.cxx | 24
sc/source/core/data/dpcachetable.cxx | 7
sc/source/core/data/dpglobal.cxx | 1
sc/source/core/data/dpgroup.cxx | 4
sc/source/core/data/dpobject.cxx | 7
sc/source/core/data/dptabdat.cxx | 11
sc/source/core/data/dptablecache.cxx | 2
sc/source/core/data/fillinfo.cxx | 6
sc/source/core/data/global.cxx | 5
sc/source/core/data/postit.cxx | 7
sc/source/core/data/stlsheet.cxx | 7
sc/source/core/data/table1.cxx | 6
sc/source/core/inc/addinhelpid.hxx | 4
sc/source/core/inc/core_pch.hxx | 2
sc/source/core/src/makefile.mk | 2
sc/source/core/tool/addincol.cxx | 14
sc/source/core/tool/addinhelpid.cxx | 10
sc/source/core/tool/charthelper.cxx | 1
sc/source/core/tool/chartpos.cxx | 23
sc/source/core/tool/formulaparserpool.cxx | 21
sc/source/core/tool/hints.cxx | 3
sc/source/core/tool/interpr1.cxx | 15
sc/source/core/tool/interpr2.cxx | 8
sc/source/core/tool/progress.cxx | 13
sc/source/filter/excel/excdoc.cxx | 3
sc/source/filter/excel/excel.cxx | 19
sc/source/filter/excel/excimp8.cxx | 16
sc/source/filter/excel/excrecds.cxx | 4
sc/source/filter/excel/impop.cxx | 2
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xeformula.cxx | 6
sc/source/filter/excel/xename.cxx | 3
sc/source/filter/excel/xepage.cxx | 2
sc/source/filter/excel/xepivot.cxx | 2
sc/source/filter/excel/xerecord.cxx | 2
sc/source/filter/excel/xeroot.cxx | 66
sc/source/filter/excel/xestream.cxx | 132 -
sc/source/filter/excel/xestring.cxx | 2
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xetable.cxx | 2
sc/source/filter/excel/xeview.cxx | 2
sc/source/filter/excel/xicontent.cxx | 7
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/excel/xiroot.cxx | 2
sc/source/filter/excel/xistream.cxx | 110 -
sc/source/filter/excel/xistyle.cxx | 13
sc/source/filter/excel/xlchart.cxx | 2
sc/source/filter/excel/xlformula.cxx | 2
sc/source/filter/excel/xlroot.cxx | 7
sc/source/filter/excel/xltools.cxx | 6
sc/source/filter/ftools/fapihelper.cxx | 34
sc/source/filter/inc/fapihelper.hxx | 7
sc/source/filter/inc/filt_pch.hxx | 6
sc/source/filter/inc/xcl97rec.hxx | 6
sc/source/filter/inc/xeroot.hxx | 6
sc/source/filter/inc/xestream.hxx | 20
sc/source/filter/inc/xiescher.hxx | 73
sc/source/filter/inc/xistream.hxx | 24
sc/source/filter/inc/xistyle.hxx | 3
sc/source/filter/inc/xlescher.hxx | 2
sc/source/filter/inc/xlroot.hxx | 5
sc/source/filter/lotus/op.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 113 -
sc/source/filter/xml/makefile.mk | 2
sc/source/filter/xml/sheetdata.cxx | 10
sc/source/filter/xml/xmlexprt.cxx | 22
sc/source/filter/xml/xmlfonte.cxx | 12
sc/source/filter/xml/xmlimprt.cxx | 14
sc/source/filter/xml/xmlwrap.cxx | 20
sc/source/ui/app/drwtrans.cxx | 12
sc/source/ui/app/inputwin.cxx | 22
sc/source/ui/app/scdll.cxx | 8
sc/source/ui/app/scmod.cxx | 62
sc/source/ui/app/transobj.cxx | 8
sc/source/ui/attrdlg/scdlgfact.cxx | 10
sc/source/ui/attrdlg/scdlgfact.hxx | 11
sc/source/ui/dbgui/asciiopt.src | 17
sc/source/ui/dbgui/consdlg.src | 16
sc/source/ui/dbgui/dapitype.src | 11
sc/source/ui/dbgui/dpgroupdlg.src | 16
sc/source/ui/dbgui/imoptdlg.src | 6
sc/source/ui/dbgui/pivot.src | 18
sc/source/ui/dbgui/pvfundlg.src | 23
sc/source/ui/dbgui/scendlg.src | 13
sc/source/ui/dbgui/scuiasciiopt.cxx | 5
sc/source/ui/dbgui/textimportoptions.src | 5
sc/source/ui/dbgui/validate.src | 20
sc/source/ui/docshell/arealink.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 24
sc/source/ui/docshell/docsh.cxx | 1
sc/source/ui/docshell/docsh2.cxx | 21
sc/source/ui/docshell/docsh4.cxx | 7
sc/source/ui/docshell/makefile.mk | 81
sc/source/ui/docshell/tablink.cxx | 3
sc/source/ui/drawfunc/drformsh.src | 20
sc/source/ui/drawfunc/drtxtob.cxx | 3
sc/source/ui/drawfunc/fuins2.cxx | 6
sc/source/ui/drawfunc/fusel.cxx | 46
sc/source/ui/drawfunc/futext2.cxx | 4
sc/source/ui/drawfunc/objdraw.src | 904 ----------
sc/source/ui/formdlg/dwfunctr.src | 4
sc/source/ui/inc/crdlg.hxx | 2
sc/source/ui/inc/delcldlg.hxx | 2
sc/source/ui/inc/delcodlg.hxx | 2
sc/source/ui/inc/docfunc.hxx | 6
sc/source/ui/inc/docsh.hxx | 8
sc/source/ui/inc/drwtrans.hxx | 6
sc/source/ui/inc/dwfunctr.hxx | 4
sc/source/ui/inc/groupdlg.hxx | 2
sc/source/ui/inc/imoptdlg.hxx | 2
sc/source/ui/inc/inputhdl.hxx | 2
sc/source/ui/inc/inscldlg.hxx | 2
sc/source/ui/inc/inscodlg.hxx | 2
sc/source/ui/inc/mtrindlg.hxx | 2
sc/source/ui/inc/mvtabdlg.hxx | 2
sc/source/ui/inc/namecrea.hxx | 2
sc/source/ui/inc/namepast.hxx | 2
sc/source/ui/inc/prevwsh.hxx | 4
sc/source/ui/inc/scendlg.hxx | 2
sc/source/ui/inc/shtabdlg.hxx | 2
sc/source/ui/inc/strindlg.hxx | 4
sc/source/ui/inc/tabbgcolordlg.hxx | 7
sc/source/ui/inc/tabview.hxx | 3
sc/source/ui/inc/tabvwsh.hxx | 6
sc/source/ui/inc/tphf.hxx | 2
sc/source/ui/inc/transobj.hxx | 3
sc/source/ui/inc/ui_pch.hxx | 4
sc/source/ui/inc/viewfunc.hxx | 5
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/acredlin.src | 4
sc/source/ui/miscdlgs/conflictsdlg.cxx | 2
sc/source/ui/miscdlgs/conflictsdlg.src | 4
sc/source/ui/miscdlgs/highred.src | 7
sc/source/ui/miscdlgs/instbdlg.src | 14
sc/source/ui/miscdlgs/linkarea.src | 6
sc/source/ui/miscdlgs/protectiondlg.src | 4
sc/source/ui/miscdlgs/retypepassdlg.src | 12
sc/source/ui/miscdlgs/scuiautofmt.cxx | 8
sc/source/ui/miscdlgs/sharedocdlg.src | 3
sc/source/ui/miscdlgs/shtabdlg.cxx | 6
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/miscdlgs/strindlg.cxx | 24
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 6
sc/source/ui/namedlg/makefile.mk | 2
sc/source/ui/navipi/content.cxx | 6
sc/source/ui/pagedlg/hfedtdlg.src | 48
sc/source/ui/pagedlg/pagedlg.src | 26
sc/source/ui/src/attrdlg.src | 4
sc/source/ui/src/autofmt.src | 28
sc/source/ui/src/condfrmt.src | 27
sc/source/ui/src/crnrdlg.src | 9
sc/source/ui/src/dbnamdlg.src | 12
sc/source/ui/src/filter.src | 58
sc/source/ui/src/hdrcont.src | 78
sc/source/ui/src/makefile.mk | 32
sc/source/ui/src/miscdlgs.src | 113 +
sc/source/ui/src/namedlg.src | 22
sc/source/ui/src/opredlin.src | 6
sc/source/ui/src/optdlg.src | 65
sc/source/ui/src/optsolver.src | 37
sc/source/ui/src/popup.src | 104 -
sc/source/ui/src/scfuncs.src | 3
sc/source/ui/src/scstring.src | 5
sc/source/ui/src/scwarngs.src | 2
sc/source/ui/src/simpref.src | 2
sc/source/ui/src/solveroptions.src | 4
sc/source/ui/src/solvrdlg.src | 11
sc/source/ui/src/sortdlg.src | 24
sc/source/ui/src/subtdlg.src | 16
sc/source/ui/src/tabopdlg.src | 8
sc/source/ui/src/textdlgs.src | 6
sc/source/ui/src/toolbox.src | 132 -
sc/source/ui/undo/undodat.cxx | 78
sc/source/ui/undo/undotab.cxx | 31
sc/source/ui/unoobj/addruno.cxx | 8
sc/source/ui/unoobj/appluno.cxx | 120 -
sc/source/ui/unoobj/cellsuno.cxx | 47
sc/source/ui/unoobj/chartuno.cxx | 11
sc/source/ui/unoobj/dapiuno.cxx | 17
sc/source/ui/unoobj/defltuno.cxx | 2
sc/source/ui/unoobj/detreg.cxx | 21
sc/source/ui/unoobj/docuno.cxx | 119 +
sc/source/ui/unoobj/fmtuno.cxx | 37
sc/source/ui/unoobj/makefile.mk | 14
sc/source/ui/unoobj/scdetect.cxx | 14
sc/source/ui/unoobj/servuno.cxx | 9
sc/source/ui/unoobj/viewuno.cxx | 29
sc/source/ui/vba/excelvbahelper.cxx | 139 -
sc/source/ui/vba/excelvbahelper.hxx | 82
sc/source/ui/vba/makefile.mk | 12
sc/source/ui/vba/service.cxx | 10
sc/source/ui/vba/testvba/makefile.mk | 6
sc/source/ui/vba/vbaapplication.cxx | 44
sc/source/ui/vba/vbaapplication.hxx | 10
sc/source/ui/vba/vbaeventshelper.cxx | 86
sc/source/ui/vba/vbaformat.cxx | 1
sc/source/ui/vba/vbaglobals.cxx | 3
sc/source/ui/vba/vbanames.cxx | 2
sc/source/ui/vba/vbarange.cxx | 660 +++++++
sc/source/ui/vba/vbarange.hxx | 22
sc/source/ui/vba/vbasheetobject.cxx | 42
sc/source/ui/vba/vbaworkbook.cxx | 12
sc/source/ui/vba/vbaworkbooks.cxx | 71
sc/source/ui/vba/vbaworkbooks.hxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 54
sc/source/ui/vba/vbaworksheet.hxx | 1
sc/source/ui/vba/vbaworksheets.cxx | 4
sc/source/ui/view/drawview.cxx | 94 -
sc/source/ui/view/formatsh.cxx | 8
sc/source/ui/view/prevwsh2.cxx | 4
sc/source/ui/view/tabview3.cxx | 8
sc/source/ui/view/tabview5.cxx | 4
sc/source/ui/view/tabvwsh3.cxx | 10
sc/source/ui/view/tabvwsh5.cxx | 9
sc/source/ui/view/tabvwshb.cxx | 9
sc/source/ui/view/tabvwshe.cxx | 4
sc/source/ui/view/tabvwshf.cxx | 8
sc/source/ui/view/viewdata.cxx | 38
sc/source/ui/view/viewfun2.cxx | 22
sc/source/ui/view/viewfun3.cxx | 55
sc/source/ui/view/viewfun7.cxx | 48
sc/source/ui/view/viewfunc.cxx | 4
sc/uiconfig/layout/makefile.mk | 10
sc/util/hidother.src | 34
sc/util/makefile.mk | 222 +-
sc/util/sc.component | 97 +
sc/util/scd.component | 34
sc/util/vbaobj.component | 58
sc/workben/makefile.mk | 44
sc/workben/test.cxx | 2
scaddins/prj/build.lst | 2
scaddins/prj/d.lst | 2
scaddins/source/analysis/analysis.component | 35
scaddins/source/analysis/analysis.cxx | 31
scaddins/source/analysis/analysis_deffuncnames.src | 10
scaddins/source/analysis/makefile.mk | 8
scaddins/source/datefunc/date.component | 35
scaddins/source/datefunc/datefunc.cxx | 29
scaddins/source/datefunc/datefunc.def | 1
scaddins/source/datefunc/makefile.mk | 68
sccomp/prj/build.lst | 2
sccomp/prj/d.lst | 1
sccomp/source/solver/makefile.mk | 8
sccomp/source/solver/solver.component | 34
sccomp/source/solver/solver.cxx | 28
439 files changed, 10275 insertions(+), 7857 deletions(-)
New commits:
commit 28c11d09759f8ff13daa7a2a66a842ae34aed32f
Merge: 910b4c4... 71b4129...
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Feb 11 01:35:43 2011 -0500
Merge remote branch 'staging/premerge/dev300_m98' into integration/dev300_m98
Conflicts:
chart2/prj/build.lst
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
chart2/source/controller/chartapiwrapper/GridWrapper.cxx
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
chart2/source/controller/dialogs/ObjectNameProvider.cxx
chart2/source/controller/dialogs/Strings.src
chart2/source/controller/dialogs/TabPages.hrc
chart2/source/controller/dialogs/dlg_ChartType.src
chart2/source/controller/dialogs/dlg_InsertErrorBars.src
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
chart2/source/controller/dialogs/dlg_ShapeFont.src
chart2/source/controller/dialogs/dlg_ShapeParagraph.src
chart2/source/controller/dialogs/tp_ChartType.cxx
chart2/source/controller/dialogs/tp_DataLabel.src
chart2/source/controller/dialogs/tp_LegendPosition.src
chart2/source/controller/dialogs/tp_TitleRotation.src
chart2/source/controller/inc/HelpIds.hrc
chart2/source/controller/main/ChartController.cxx
chart2/source/controller/main/ChartController_Window.cxx
chart2/source/controller/main/DrawCommandDispatch.hrc
chart2/source/controller/main/ShapeController.cxx
chart2/source/controller/main/StatusBarCommandDispatch.cxx
chart2/source/controller/makefile.mk
chart2/source/inc/InternalData.hxx
chart2/source/inc/OPropertySet.hxx
chart2/source/inc/Strings.hrc
chart2/source/inc/servicenames.hxx
chart2/source/model/main/Axis.cxx
chart2/source/model/main/BaseCoordinateSystem.cxx
chart2/source/model/main/ChartModel.cxx
chart2/source/model/main/ChartModel.hxx
chart2/source/model/main/DataPoint.cxx
chart2/source/model/main/DataSeries.cxx
chart2/source/model/main/Diagram.cxx
chart2/source/model/main/FormattedString.cxx
chart2/source/model/main/GridProperties.cxx
chart2/source/model/main/Legend.cxx
chart2/source/model/main/PageBackground.cxx
chart2/source/model/main/StockBar.cxx
chart2/source/model/main/Title.cxx
chart2/source/model/main/Wall.cxx
chart2/source/model/main/makefile.mk
chart2/source/model/makefile.mk
chart2/source/model/template/AreaChartTypeTemplate.cxx
chart2/source/model/template/BarChartTypeTemplate.cxx
chart2/source/model/template/BubbleChartType.cxx
chart2/source/model/template/BubbleChartTypeTemplate.cxx
chart2/source/model/template/CandleStickChartType.cxx
chart2/source/model/template/ChartType.cxx
chart2/source/model/template/ColumnChartType.cxx
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
chart2/source/model/template/LineChartType.cxx
chart2/source/model/template/LineChartTypeTemplate.cxx
chart2/source/model/template/NetChartType.cxx
chart2/source/model/template/PieChartType.cxx
chart2/source/model/template/PieChartTypeTemplate.cxx
chart2/source/model/template/ScatterChartType.cxx
chart2/source/model/template/ScatterChartTypeTemplate.cxx
chart2/source/model/template/StockChartTypeTemplate.cxx
chart2/source/tools/DiagramHelper.cxx
chart2/source/tools/ErrorBar.cxx
chart2/source/tools/ExplicitCategoriesProvider.cxx
chart2/source/tools/InternalData.cxx
chart2/source/tools/InternalDataProvider.cxx
chart2/source/tools/RegressionCurveModel.cxx
chart2/source/tools/RegressionEquation.cxx
chart2/source/tools/WrappedPropertySet.cxx
chart2/source/view/axes/VCartesianAxis.cxx
chart2/source/view/charttypes/PieChart.cxx
chart2/source/view/main/ChartView.cxx
chart2/source/view/main/PropertyMapper.cxx
sc/addin/datefunc/makefile.mk
sc/addin/makefile.mk
sc/addin/rot13/makefile.mk
sc/addin/util/makefile.mk
sc/inc/charthelper.hxx
sc/inc/dociter.hxx
sc/inc/docparam.hxx
sc/inc/document.hxx
sc/inc/dpcachetable.hxx
sc/inc/dpglobal.hxx
sc/inc/dpobject.hxx
sc/inc/eetext.hxx
sc/inc/eventuno.hxx
sc/inc/externalrefmgr.hxx
sc/inc/funcdesc.hxx
sc/inc/global.hxx
sc/inc/globstr.hrc
sc/inc/pch/precompiled_sc.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/scmatrix.hxx
sc/inc/segdefs.hxx
sc/inc/sheetevents.hxx
sc/inc/stringutil.hxx
sc/inc/table.hxx
sc/inc/unoguard.hxx
sc/inc/unonames.hxx
sc/inc/viewuno.hxx
sc/prj/build.lst
sc/qa/complex/calcPreview/makefile.mk
sc/qa/complex/cellRanges/makefile.mk
sc/qa/complex/dataPilot/_XPropertySet.java
sc/source/core/data/column3.cxx
sc/source/core/data/conditio.cxx
sc/source/core/data/docparam.cxx
sc/source/core/data/docpool.cxx
sc/source/core/data/documen2.cxx
sc/source/core/data/documen3.cxx
sc/source/core/data/documen5.cxx
sc/source/core/data/documen8.cxx
sc/source/core/data/document.cxx
sc/source/core/data/dpcachetable.cxx
sc/source/core/data/dpglobal.cxx
sc/source/core/data/dpgroup.cxx
sc/source/core/data/dpobject.cxx
sc/source/core/data/dpsdbtab.cxx
sc/source/core/data/dpshttab.cxx
sc/source/core/data/dptabdat.cxx
sc/source/core/data/dptablecache.cxx
sc/source/core/data/dptabres.cxx
sc/source/core/data/dptabsrc.cxx
sc/source/core/data/drwlayer.cxx
sc/source/core/data/global.cxx
sc/source/core/data/pivot.cxx
sc/source/core/data/pivot2.cxx
sc/source/core/data/scdpoutputimpl.hxx
sc/source/core/data/tabbgcolor.cxx
sc/source/core/data/table1.cxx
sc/source/core/data/table2.cxx
sc/source/core/data/tabprotection.cxx
sc/source/core/inc/interpre.hxx
sc/source/core/tool/charthelper.cxx
sc/source/core/tool/collect.cxx
sc/source/core/tool/compiler.cxx
sc/source/core/tool/doubleref.cxx
sc/source/core/tool/hints.cxx
sc/source/core/tool/interpr1.cxx
sc/source/core/tool/interpr4.cxx
sc/source/core/tool/rangelst.cxx
sc/source/core/tool/scmatrix.cxx
sc/source/filter/dif/makefile.mk
sc/source/filter/excel/excdoc.cxx
sc/source/filter/excel/excimp8.cxx
sc/source/filter/excel/read.cxx
sc/source/filter/excel/xechart.cxx
sc/source/filter/excel/xeescher.cxx
sc/source/filter/excel/xelink.cxx
sc/source/filter/excel/xepage.cxx
sc/source/filter/excel/xeroot.cxx
sc/source/filter/excel/xestream.cxx
sc/source/filter/excel/xestyle.cxx
sc/source/filter/excel/xetable.cxx
sc/source/filter/excel/xichart.cxx
sc/source/filter/excel/xicontent.cxx
sc/source/filter/excel/xiescher.cxx
sc/source/filter/excel/xilink.cxx
sc/source/filter/excel/xiroot.cxx
sc/source/filter/excel/xistyle.cxx
sc/source/filter/excel/xlchart.cxx
sc/source/filter/excel/xlescher.cxx
sc/source/filter/excel/xlroot.cxx
sc/source/filter/excel/xltools.cxx
sc/source/filter/html/htmlpars.cxx
sc/source/filter/inc/eeparser.hxx
sc/source/filter/inc/excimp8.hxx
sc/source/filter/inc/ftools.hxx
sc/source/filter/inc/htmlpars.hxx
sc/source/filter/inc/xcl97rec.hxx
sc/source/filter/inc/xeescher.hxx
sc/source/filter/inc/xeroot.hxx
sc/source/filter/inc/xestream.hxx
sc/source/filter/inc/xichart.hxx
sc/source/filter/inc/xiescher.hxx
sc/source/filter/inc/xiroot.hxx
sc/source/filter/inc/xistream.hxx
sc/source/filter/inc/xistyle.hxx
sc/source/filter/inc/xlescher.hxx
sc/source/filter/inc/xltools.hxx
sc/source/filter/xcl97/xcl97esc.cxx
sc/source/filter/xcl97/xcl97rec.cxx
sc/source/filter/xml/XMLCodeNameProvider.hxx
sc/source/filter/xml/XMLStylesExportHelper.cxx
sc/source/filter/xml/makefile.mk
sc/source/filter/xml/sheetdata.cxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlimprt.cxx
sc/source/filter/xml/xmlstyle.cxx
sc/source/filter/xml/xmlsubti.cxx
sc/source/filter/xml/xmlwrap.cxx
sc/source/ui/app/inputwin.cxx
sc/source/ui/app/scdll.cxx
sc/source/ui/app/scmod.cxx
sc/source/ui/attrdlg/scdlgfact.cxx
sc/source/ui/attrdlg/scdlgfact.hxx
sc/source/ui/cctrl/dpcontrol.src
sc/source/ui/dbgui/asciiopt.cxx
sc/source/ui/dbgui/asciiopt.src
sc/source/ui/dbgui/fieldwnd.cxx
sc/source/ui/dbgui/pivot.src
sc/source/ui/dbgui/pvfundlg.cxx
sc/source/ui/dbgui/pvfundlg.src
sc/source/ui/dbgui/pvlaydlg.cxx
sc/source/ui/dbgui/textimportoptions.src
sc/source/ui/dbgui/validate.src
sc/source/ui/docshell/arealink.cxx
sc/source/ui/docshell/docfunc.cxx
sc/source/ui/docshell/docsh4.cxx
sc/source/ui/docshell/docsh5.cxx
sc/source/ui/docshell/externalrefmgr.cxx
sc/source/ui/drawfunc/drtxtob.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/dpcontrol.hrc
sc/source/ui/inc/dwfunctr.hxx
sc/source/ui/inc/fieldwnd.hxx
sc/source/ui/inc/gridwin.hxx
sc/source/ui/inc/miscdlgs.hrc
sc/source/ui/inc/overlayobject.hxx
sc/source/ui/inc/tabbgcolordlg.hxx
sc/source/ui/inc/teamdlg.hxx
sc/source/ui/inc/textimportoptions.hrc
sc/source/ui/inc/textimportoptions.hxx
sc/source/ui/inc/ui_pch.hxx
sc/source/ui/inc/validate.hxx
sc/source/ui/inc/viewfunc.hxx
sc/source/ui/miscdlgs/anyrefdg.cxx
sc/source/ui/miscdlgs/tabbgcolordlg.cxx
sc/source/ui/namedlg/makefile.mk
sc/source/ui/navipi/content.cxx
sc/source/ui/pagedlg/hfedtdlg.src
sc/source/ui/src/autofmt.src
sc/source/ui/src/globstr.src
sc/source/ui/src/hdrcont.src
sc/source/ui/src/makefile.mk
sc/source/ui/src/miscdlgs.src
sc/source/ui/src/popup.src
sc/source/ui/src/sortdlg.src
sc/source/ui/undo/undodat.cxx
sc/source/ui/undo/undotab.cxx
sc/source/ui/unoobj/addruno.cxx
sc/source/ui/unoobj/appluno.cxx
sc/source/ui/unoobj/chartuno.cxx
sc/source/ui/unoobj/dapiuno.cxx
sc/source/ui/unoobj/docuno.cxx
sc/source/ui/unoobj/eventuno.cxx
sc/source/ui/unoobj/fmtuno.cxx
sc/source/ui/unoobj/funcuno.cxx
sc/source/ui/unoobj/miscuno.cxx
sc/source/ui/unoobj/nameuno.cxx
sc/source/ui/unoobj/scdetect.cxx
sc/source/ui/unoobj/servuno.cxx
sc/source/ui/unoobj/styleuno.cxx
sc/source/ui/unoobj/viewuno.cxx
sc/source/ui/vba/excelvbahelper.cxx
sc/source/ui/vba/excelvbahelper.hxx
sc/source/ui/vba/service.cxx
sc/source/ui/vba/vbaapplication.cxx
sc/source/ui/vba/vbaapplication.hxx
sc/source/ui/vba/vbabutton.hxx
sc/source/ui/vba/vbacommentshape.cxx
sc/source/ui/vba/vbacommentshape.hxx
sc/source/ui/vba/vbadialog.cxx
sc/source/ui/vba/vbaeventshelper.cxx
sc/source/ui/vba/vbaeventshelper.hxx
sc/source/ui/vba/vbafiledialog.hxx
sc/source/ui/vba/vbaformat.cxx
sc/source/ui/vba/vbaglobals.cxx
sc/source/ui/vba/vbahyperlinks.cxx
sc/source/ui/vba/vbahyperlinks.hxx
sc/source/ui/vba/vbaimage.hxx
sc/source/ui/vba/vbapagebreak.cxx
sc/source/ui/vba/vbapagebreaks.cxx
sc/source/ui/vba/vbaquerytable.hxx
sc/source/ui/vba/vbarange.cxx
sc/source/ui/vba/vbarange.hxx
sc/source/ui/vba/vbasheetobject.cxx
sc/source/ui/vba/vbasheetobject.hxx
sc/source/ui/vba/vbasheetobjects.cxx
sc/source/ui/vba/vbasheetobjects.hxx
sc/source/ui/vba/vbaworkbook.cxx
sc/source/ui/vba/vbaworkbooks.cxx
sc/source/ui/vba/vbaworkbooks.hxx
sc/source/ui/vba/vbaworksheet.cxx
sc/source/ui/vba/vbaworksheet.hxx
sc/source/ui/vba/vbaworksheets.cxx
sc/source/ui/vba/vbawsfunction.cxx
sc/source/ui/view/drawview.cxx
sc/source/ui/view/gridwin.cxx
sc/source/ui/view/prevwsh.cxx
sc/source/ui/view/printfun.cxx
sc/source/ui/view/tabview.cxx
sc/source/ui/view/tabview3.cxx
sc/source/ui/view/tabview5.cxx
sc/source/ui/view/tabvwsh.cxx
sc/source/ui/view/tabvwsh4.cxx
sc/source/ui/view/tabvwshe.cxx
sc/source/ui/view/tabvwshf.cxx
sc/source/ui/view/viewdata.cxx
sc/source/ui/view/viewfun2.cxx
sc/source/ui/view/viewfun3.cxx
sc/util/hidother.src
scaddins/source/datefunc/datefunc.cxx
sccomp/source/solver/solver.cxx
diff --cc chart2/inc/makefile.mk
index e3e7d19,ddaf7b6..69507ab
--- a/chart2/inc/makefile.mk
+++ b/chart2/inc/makefile.mk
@@@ -40,8 -40,8 +40,8 @@@ TARGET=in
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
- .ENDIF # "$(ENABLE_PCH)"!=""
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
++ $(SLO)$/precompiled.pch \
++ $(SLO)$/precompiled_ex.pch
++
++.ENDIF # "$(ENABLE_PCH)"!=""
diff --cc chart2/qa/makefile.mk
index 0471e10,e1f8034..77a948d
--- a/chart2/qa/makefile.mk
+++ b/chart2/qa/makefile.mk
@@@ -25,9 -25,9 +25,9 @@@
#
#*************************************************************************
--PRJNAME = chart2
--PRJ = ..
--TARGET = chart_qa
++PRJNAME = chart2
++PRJ = ..
++TARGET = chart_qa
PACKAGE = qa
@@@ -39,9 -39,9 +39,9 @@@ MAXLINELENGTH = 10000
# - rdb ----
--RDB = $(SOLARBINDIR)$/types.rdb
--JAVADIR = $(OUT)$/misc$/java
--JARFILES = ridl.jar
++RDB = $(SOLARBINDIR)$/types.rdb
++JAVADIR = $(OUT)$/misc$/java
++JARFILES = ridl.jar
# --- Files --------------------------------------------------------
@@@ -67,4 -67,4 +67,4 @@@ ALLTAR: runtes
runtest: $(subst,.class,.run $(JAVACLASSFILES))
%.run: %.class
- + at java -classpath $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(subst,$(CLASSDIR)$/$(PACKAGE)$/,$(PACKAGE). $(subst,.class, $<))
- + at java -classpath $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(subst,$(CLASSDIR)$/$(PACKAGE)$/,$(PACKAGE). $(subst,.class, $<))
++ + at java -classpath $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(subst,$(CLASSDIR)$/$(PACKAGE)$/,$(PACKAGE). $(subst,.class, $<))
diff --cc chart2/source/controller/chartapiwrapper/makefile.mk
index 0af72c7,8df2fef..4520890
--- a/chart2/source/controller/chartapiwrapper/makefile.mk
+++ b/chart2/source/controller/chartapiwrapper/makefile.mk
@@@ -25,13 -25,13 +25,13 @@@
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJNAME= chart2
--TARGET= chchartapiwrapper
++PRJ= ..$/..$/..
++PRJNAME= chart2
++TARGET= chchartapiwrapper
--PRJINC= $(PRJ)$/source
++PRJINC= $(PRJ)$/source
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@@ -41,32 -41,32 +41,32 @@@
# --- export library -------------------------------------------------
#Specifies object files to bind into linked libraries.
--SLOFILES= \
++SLOFILES= \
$(SLO)$/Chart2ModelContact.obj \
- $(SLO)$/AreaWrapper.obj \
- $(SLO)$/AxisWrapper.obj \
- $(SLO)$/ChartDataWrapper.obj \
- $(SLO)$/ChartDocumentWrapper.obj \
- $(SLO)$/DataSeriesPointWrapper.obj \
- $(SLO)$/DiagramWrapper.obj \
- $(SLO)$/GridWrapper.obj \
- $(SLO)$/LegendWrapper.obj \
- $(SLO)$/TitleWrapper.obj \
- $(SLO)$/MinMaxLineWrapper.obj \
- $(SLO)$/UpDownBarWrapper.obj \
- $(SLO)$/WallFloorWrapper.obj \
- $(SLO)$/WrappedAutomaticPositionProperties.obj \
- $(SLO)$/WrappedCharacterHeightProperty.obj \
- $(SLO)$/WrappedDataCaptionProperties.obj \
- $(SLO)$/WrappedTextRotationProperty.obj \
- $(SLO)$/WrappedGapwidthProperty.obj \
- $(SLO)$/WrappedScaleProperty.obj \
- $(SLO)$/WrappedSplineProperties.obj \
- $(SLO)$/WrappedStockProperties.obj \
- $(SLO)$/WrappedSymbolProperties.obj \
- $(SLO)$/WrappedAxisAndGridExistenceProperties.obj \
- $(SLO)$/WrappedNumberFormatProperty.obj \
- $(SLO)$/WrappedStatisticProperties.obj \
- $(SLO)$/AreaWrapper.obj \
- $(SLO)$/AxisWrapper.obj \
- $(SLO)$/ChartDataWrapper.obj \
- $(SLO)$/ChartDocumentWrapper.obj \
- $(SLO)$/DataSeriesPointWrapper.obj \
- $(SLO)$/DiagramWrapper.obj \
- $(SLO)$/GridWrapper.obj \
- $(SLO)$/LegendWrapper.obj \
- $(SLO)$/TitleWrapper.obj \
- $(SLO)$/MinMaxLineWrapper.obj \
- $(SLO)$/UpDownBarWrapper.obj \
- $(SLO)$/WallFloorWrapper.obj \
- $(SLO)$/WrappedAutomaticPositionProperties.obj \
- $(SLO)$/WrappedCharacterHeightProperty.obj \
- $(SLO)$/WrappedDataCaptionProperties.obj \
- $(SLO)$/WrappedTextRotationProperty.obj \
- $(SLO)$/WrappedGapwidthProperty.obj \
- $(SLO)$/WrappedScaleProperty.obj \
- $(SLO)$/WrappedSplineProperties.obj \
- $(SLO)$/WrappedStockProperties.obj \
- $(SLO)$/WrappedSymbolProperties.obj \
- $(SLO)$/WrappedAxisAndGridExistenceProperties.obj \
- $(SLO)$/WrappedNumberFormatProperty.obj \
- $(SLO)$/WrappedStatisticProperties.obj \
++ $(SLO)$/AreaWrapper.obj \
++ $(SLO)$/AxisWrapper.obj \
++ $(SLO)$/ChartDataWrapper.obj \
++ $(SLO)$/ChartDocumentWrapper.obj \
++ $(SLO)$/DataSeriesPointWrapper.obj \
++ $(SLO)$/DiagramWrapper.obj \
++ $(SLO)$/GridWrapper.obj \
++ $(SLO)$/LegendWrapper.obj \
++ $(SLO)$/TitleWrapper.obj \
++ $(SLO)$/MinMaxLineWrapper.obj \
++ $(SLO)$/UpDownBarWrapper.obj \
++ $(SLO)$/WallFloorWrapper.obj \
++ $(SLO)$/WrappedAutomaticPositionProperties.obj \
++ $(SLO)$/WrappedCharacterHeightProperty.obj \
++ $(SLO)$/WrappedDataCaptionProperties.obj \
++ $(SLO)$/WrappedTextRotationProperty.obj \
++ $(SLO)$/WrappedGapwidthProperty.obj \
++ $(SLO)$/WrappedScaleProperty.obj \
++ $(SLO)$/WrappedSplineProperties.obj \
++ $(SLO)$/WrappedStockProperties.obj \
++ $(SLO)$/WrappedSymbolProperties.obj \
++ $(SLO)$/WrappedAxisAndGridExistenceProperties.obj \
++ $(SLO)$/WrappedNumberFormatProperty.obj \
++ $(SLO)$/WrappedStatisticProperties.obj \
$(SLO)$/WrappedSceneProperty.obj \
$(SLO)$/WrappedSeriesAreaOrLineProperty.obj \
$(SLO)$/WrappedAddInProperty.obj \
diff --cc chart2/source/controller/dialogs/makefile.mk
index cc69274,4b5b374..deb3bf3
--- a/chart2/source/controller/dialogs/makefile.mk
+++ b/chart2/source/controller/dialogs/makefile.mk
@@@ -25,12 -25,12 +25,12 @@@
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJINC= $(PRJ)$/source
--PRJNAME= chart2
--TARGET= chcdialogs
++PRJ= ..$/..$/..
++PRJINC= $(PRJ)$/source
++PRJNAME= chart2
++TARGET= chcdialogs
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
VISIBILITY_HIDDEN=TRUE
GEN_HID_OTHER=TRUE
@@@ -47,7 -47,7 +47,7 @@@
# --- export library -------------------------------------------------
#object files to build and link together to lib $(SLB)$/$(TARGET).lib
--SLOFILES= \
++SLOFILES= \
$(SLO)$/ObjectNameProvider.obj \
$(SLO)$/TimerTriggeredControllerLock.obj \
$(SLO)$/ChangingResource.obj \
@@@ -86,7 -86,7 +86,7 @@@
$(SLO)$/dlg_ObjectProperties.obj \
$(SLO)$/dlg_DataEditor.obj \
$(SLO)$/dlg_DataSource.obj \
- $(SLO)$/dlg_View3D.obj \
- $(SLO)$/dlg_View3D.obj \
++ $(SLO)$/dlg_View3D.obj \
$(SLO)$/dlg_InsertAxis_Grid.obj \
$(SLO)$/dlg_InsertDataLabel.obj \
$(SLO)$/dlg_InsertLegend.obj \
@@@ -108,7 -108,7 +108,7 @@@
# --- Resources ---------------------------------------------------------------
--SRC1FILES= \
++SRC1FILES= \
res_TextSeparator.src \
res_BarGeometry.src \
tp_ChartType.src \
diff --cc chart2/source/controller/drawinglayer/makefile.mk
index ab0645e,f0473b8..729bd5c
--- a/chart2/source/controller/drawinglayer/makefile.mk
+++ b/chart2/source/controller/drawinglayer/makefile.mk
@@@ -25,12 -25,12 +25,12 @@@
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJINC= $(PRJ)$/source
--PRJNAME= chart2
--TARGET= chcdrawinglayer
++PRJ= ..$/..$/..
++PRJINC= $(PRJ)$/source
++PRJNAME= chart2
++TARGET= chcdrawinglayer
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@@ -40,8 -40,8 +40,8 @@@
# --- export library -------------------------------------------------
#object files to build and link together to lib $(SLB)$/$(TARGET).lib
--SLOFILES= $(SLO)$/DrawViewWrapper.obj \
- $(SLO)$/ViewElementListProvider.obj
- $(SLO)$/ViewElementListProvider.obj
++SLOFILES= $(SLO)$/DrawViewWrapper.obj \
++ $(SLO)$/ViewElementListProvider.obj
# --- Targets -----------------------------------------------------------------
diff --cc chart2/source/controller/inc/HelpIds.hrc
index 9532354,9728093..b600829
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@@ -27,131 -27,135 +27,134 @@@
#ifndef CHART_HELPIDS_HRC
#define CHART_HELPIDS_HRC
- #include <svl/solar.hrc>
- //next is 120
- //free: 20, 21, 22, 30, 31, 32, 33
+ #define HID_SCH_ALIGNMENT "CHART2_HID_SCH_ALIGNMENT"
+ #define HID_SCH_LEGEND_POS "CHART2_HID_SCH_LEGEND_POS"
+ #define HID_SCH_DATA_DESCR "CHART2_HID_SCH_DATA_DESCR"
- //see old chart: schhids.h
+ #define HID_SCH_STAT "CHART2_HID_SCH_STAT"
+ #define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT"
+ #define HID_SCH_CTL_DATA "CHART2_HID_SCH_CTL_DATA"
- #define HID_SCH_ALIGNMENT (HID_SCH_START + 4)
- #define HID_SCH_LEGEND_POS (HID_SCH_START + 5)
- #define HID_SCH_DATA_DESCR (HID_SCH_START + 6)
-
- #define HID_SCH_STAT (HID_SCH_START + 8)
- #define HID_SCH_WIN_DOCUMENT (HID_SCH_START + 9)
- #define HID_SCH_CTL_DATA (HID_SCH_START + 10)
-
- #define HID_SCH_CT_INDICATE (HID_SCH_START + 11)
+ #define HID_SCH_CT_INDICATE "CHART2_HID_SCH_CT_INDICATE"
//for chart type dialog:
- #define HID_SCH_CTL_TYPE (HID_SCH_START + 13)
- #define HID_SCH_CTL_VARIANT (HID_SCH_START + 14)
- #define HID_SCH_NUM_OF_LINES (HID_SCH_START + 43)
- #define HID_SCH_SERIES_LIST (HID_SCH_START + 15)
- #define HID_SCH_DATA_RANGES_LIST (HID_SCH_START + 16)
-
- #define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23)
- #define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24)
- #define HID_SCH_TBI_DATA_DELETE_ROW (HID_SCH_START + 25)
- #define HID_SCH_TBI_DATA_DELETE_COL (HID_SCH_START + 26)
- #define HID_SCH_TBI_DATA_SWAP_COL (HID_SCH_START + 27)
- #define HID_SCH_TBI_DATA_SWAP_ROW (HID_SCH_START + 28)
- #define HID_SCH_TBI_DATA_INSERT_TEXT_COL (HID_SCH_START + 29)
- #define HID_SCH_TBX_DATA (HID_SCH_START + 34)
-
- #define HID_SCH_ALIGNMENT_CTR_DIAL (HID_SCH_START + 35)
- #define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36)
- #define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37)
- #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)
- #define HID_SCH_DLG_SPLINE_PROPERTIES (HID_SCH_START + 46)
- #define HID_SCH_DLG_RANGES (HID_SCH_START + 47)
-
- #define HID_SCH_CB_XAXIS (HID_SCH_START + 48)
- #define HID_SCH_CB_YAXIS (HID_SCH_START + 49)
- #define HID_SCH_CB_ZAXIS (HID_SCH_START + 50)
- #define HID_SCH_CB_SECONDARY_XAXIS (HID_SCH_START + 51)
- #define HID_SCH_CB_SECONDARY_YAXIS (HID_SCH_START + 52)
- #define HID_SCH_CB_SECONDARY_ZAXIS (HID_SCH_START + 53)
-
- #define HID_SCH_CB_XGRID (HID_SCH_START + 54)
- #define HID_SCH_CB_YGRID (HID_SCH_START + 55)
- #define HID_SCH_CB_ZGRID (HID_SCH_START + 56)
- #define HID_SCH_CB_SECONDARY_XGRID (HID_SCH_START + 57)
- #define HID_SCH_CB_SECONDARY_YGRID (HID_SCH_START + 58)
- #define HID_SCH_CB_SECONDARY_ZGRID (HID_SCH_START + 59)
-
- #define HID_SCH_LEGEND_POS_LEFT (HID_SCH_START + 60)
- #define HID_SCH_LEGEND_POS_TOP (HID_SCH_START + 61)
- #define HID_SCH_LEGEND_POS_RIGHT (HID_SCH_START + 62)
- #define HID_SCH_LEGEND_POS_BOTTOM (HID_SCH_START + 63)
-
- #define HID_SCH_STATISTIK_MEANVALUE (HID_SCH_START + 64)
- #define HID_SCH_STATISTIK_NO_ERROR (HID_SCH_START + 65)
- #define HID_SCH_STATISTIK_VARIANT (HID_SCH_START + 66)
- #define HID_SCH_STATISTIK_SIGMA (HID_SCH_START + 67)
- #define HID_SCH_STATISTIK_PERCENT (HID_SCH_START + 68)
- #define HID_SCH_STATISTIK_BIGERROR (HID_SCH_START + 69)
- #define HID_SCH_STATISTIK_CONSTERROR (HID_SCH_START + 70)
- #define HID_SCH_STATISTIK_PERCENT_VALUE (HID_SCH_START + 71)
- #define HID_SCH_STATISTIK_BIGERROR_VALUE (HID_SCH_START + 72)
- #define HID_SCH_STATISTIK_PLUS_VALUE (HID_SCH_START + 73)
- #define HID_SCH_STATISTIK_MINUS_VALUE (HID_SCH_START + 74)
-
- #define HID_SCH_DATALABEL_VALUE (HID_SCH_START + 75)
- #define HID_SCH_DATALABEL_NUMBER (HID_SCH_START + 76)
- #define HID_SCH_DATALABEL_PERCENT (HID_SCH_START + 77)
- #define HID_SCH_DATALABEL_TEXT (HID_SCH_START + 78)
- #define HID_SCH_DATALABEL_SYMBOL (HID_SCH_START + 79)
- #define HID_SCH_PB_NUMBERFORMAT (HID_SCH_START + 88)
- #define HID_SCH_PB_PERCENT_NUMBERFORMAT (HID_SCH_START + 89)
- #define HID_SCH_DATALABEL_SEPARATOR (HID_SCH_START + 90)
- #define HID_SCH_DATALABEL_PLACEMENT (HID_SCH_START + 91)
- #define HID_SCH_TEXTDIRECTION (HID_SCH_START + 115)
- #define HID_SCH_TEXTDIRECTION_TITLE (HID_SCH_START + 116)
- #define HID_SCH_TEXTDIRECTION_EQUATION (HID_SCH_START + 117)
- #define HID_SCH_DATALABEL_ROTATION_KNOB (HID_SCH_START + 118)
- #define HID_SCH_DATALABEL_ROTATION_EDIT (HID_SCH_START + 119)
-
- #define HID_SCH_TITLE_MAIN (HID_SCH_START + 80)
- #define HID_SCH_TITLE_SUB (HID_SCH_START + 81)
- #define HID_SCH_TITLE_X (HID_SCH_START + 82)
- #define HID_SCH_TITLE_Y (HID_SCH_START + 83)
- #define HID_SCH_TITLE_Z (HID_SCH_START + 84)
- #define HID_SCH_TITLE_SECONDARY_X (HID_SCH_START + 92)
- #define HID_SCH_TITLE_SECONDARY_Y (HID_SCH_START + 93)
-
- #define HID_SCH_WIZARD_ROADMAP (HID_SCH_START + 85)
- #define HID_SCH_LEGEND_SHOW (HID_SCH_START + 86)
- #define HID_SCH_DATA_SERIES_LABEL (HID_SCH_START + 87)
-
- #define HID_SCH_STARTING_ANGLE_DIAL (HID_SCH_START + 94)
-
- #define HID_SCH_TRENDLINE_RB_NONE (HID_SCH_START + 95)
- #define HID_SCH_TRENDLINE_RB_LINEAR (HID_SCH_START + 96)
- #define HID_SCH_TRENDLINE_RB_LOGARITHMIC (HID_SCH_START + 97)
- #define HID_SCH_TRENDLINE_RB_EXPONENTIAL (HID_SCH_START + 98)
- #define HID_SCH_TRENDLINE_RB_POWER (HID_SCH_START + 99)
- #define HID_SCH_TRENDLINE_SHOW_EQUATION (HID_SCH_START + 100)
- #define HID_SCH_TRENDLINE_SHOW_R_SQUARED (HID_SCH_START + 101)
-
- #define HID_SCH_STATISTIK_FUNCTION (HID_SCH_START + 102)
- #define HID_SCH_STATISTIK_RANGE (HID_SCH_START + 103)
- #define HID_SCH_STATISTIK_FUNCTION_LB (HID_SCH_START + 104)
- #define HID_SCH_STATISTIK_POSITIVE_VALUE (HID_SCH_START + 105)
- #define HID_SCH_STATISTIK_POSITIVE_RANGE (HID_SCH_START + 106)
- #define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER (HID_SCH_START + 107)
- #define HID_SCH_STATISTIK_NEGATIVE_VALUE (HID_SCH_START + 108)
- #define HID_SCH_STATISTIK_NEGATIVE_RANGE (HID_SCH_START + 109)
- #define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER (HID_SCH_START + 110)
- #define HID_SCH_STATISTIK_SAME_FOR_BOTH (HID_SCH_START + 111)
- #define HID_SCH_STATISTIK_SHOW_BOTH (HID_SCH_START + 112)
- #define HID_SCH_STATISTIK_SHOW_POSITIVE (HID_SCH_START + 113)
- #define HID_SCH_STATISTIK_SHOW_NEGATIVE (HID_SCH_START + 114)
-
-
- // HID_SCH_START should be 63280 (checked 25.Nov 2002)
+ #define HID_SCH_CTL_TYPE "CHART2_HID_SCH_CTL_TYPE"
+ #define HID_SCH_CTL_VARIANT "CHART2_HID_SCH_CTL_VARIANT"
+ #define HID_SCH_NUM_OF_LINES "CHART2_HID_SCH_NUM_OF_LINES"
+ #define HID_SCH_SERIES_LIST "CHART2_HID_SCH_SERIES_LIST"
+ #define HID_SCH_DATA_RANGES_LIST "CHART2_HID_SCH_DATA_RANGES_LIST"
+
+ #define HID_SCH_TBI_DATA_INSERT_ROW "CHART2_HID_SCH_TBI_DATA_INSERT_ROW"
+ #define HID_SCH_TBI_DATA_INSERT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_COL"
+ #define HID_SCH_TBI_DATA_DELETE_ROW "CHART2_HID_SCH_TBI_DATA_DELETE_ROW"
+ #define HID_SCH_TBI_DATA_DELETE_COL "CHART2_HID_SCH_TBI_DATA_DELETE_COL"
+ #define HID_SCH_TBI_DATA_SWAP_COL "CHART2_HID_SCH_TBI_DATA_SWAP_COL"
+ #define HID_SCH_TBI_DATA_SWAP_ROW "CHART2_HID_SCH_TBI_DATA_SWAP_ROW"
+ #define HID_SCH_TBI_DATA_INSERT_TEXT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL"
+ #define HID_SCH_TBX_DATA "CHART2_HID_SCH_TBX_DATA"
+
+ #define HID_SCH_ALIGNMENT_CTR_DIAL "CHART2_HID_SCH_ALIGNMENT_CTR_DIAL"
+ #define HID_SCH_ALIGNMENT_STACKED "CHART2_HID_SCH_ALIGNMENT_STACKED"
+ #define HID_SCH_ALIGNMENT_DEGREES "CHART2_HID_SCH_ALIGNMENT_DEGREES"
+
+ #define HID_SCH_TP_AXIS_LABEL "CHART2_HID_SCH_TP_AXIS_LABEL"
+
+ #define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT"
+ #define HID_SCH_LB_BAR_GEOMETRY "CHART2_HID_SCH_LB_BAR_GEOMETRY"
+ #define HID_SCH_DLG_SPLINE_PROPERTIES "CHART2_HID_SCH_DLG_SPLINE_PROPERTIES"
+ #define HID_SCH_DLG_RANGES "CHART2_HID_SCH_DLG_RANGES"
+
+ #define HID_SCH_CB_XAXIS "CHART2_HID_SCH_CB_XAXIS"
+ #define HID_SCH_CB_YAXIS "CHART2_HID_SCH_CB_YAXIS"
+ #define HID_SCH_CB_ZAXIS "CHART2_HID_SCH_CB_ZAXIS"
+ #define HID_SCH_CB_SECONDARY_XAXIS "CHART2_HID_SCH_CB_SECONDARY_XAXIS"
+ #define HID_SCH_CB_SECONDARY_YAXIS "CHART2_HID_SCH_CB_SECONDARY_YAXIS"
+ #define HID_SCH_CB_SECONDARY_ZAXIS "CHART2_HID_SCH_CB_SECONDARY_ZAXIS"
+
+ #define HID_SCH_CB_XGRID "CHART2_HID_SCH_CB_XGRID"
+ #define HID_SCH_CB_YGRID "CHART2_HID_SCH_CB_YGRID"
+ #define HID_SCH_CB_ZGRID "CHART2_HID_SCH_CB_ZGRID"
+ #define HID_SCH_CB_SECONDARY_XGRID "CHART2_HID_SCH_CB_SECONDARY_XGRID"
+ #define HID_SCH_CB_SECONDARY_YGRID "CHART2_HID_SCH_CB_SECONDARY_YGRID"
+ #define HID_SCH_CB_SECONDARY_ZGRID "CHART2_HID_SCH_CB_SECONDARY_ZGRID"
+
+ #define HID_SCH_LEGEND_POS_LEFT "CHART2_HID_SCH_LEGEND_POS_LEFT"
+ #define HID_SCH_LEGEND_POS_TOP "CHART2_HID_SCH_LEGEND_POS_TOP"
+ #define HID_SCH_LEGEND_POS_RIGHT "CHART2_HID_SCH_LEGEND_POS_RIGHT"
+ #define HID_SCH_LEGEND_POS_BOTTOM "CHART2_HID_SCH_LEGEND_POS_BOTTOM"
+
+ #define HID_SCH_STATISTIK_MEANVALUE "CHART2_HID_SCH_STATISTIK_MEANVALUE"
+ #define HID_SCH_STATISTIK_NO_ERROR "CHART2_HID_SCH_STATISTIK_NO_ERROR"
+ #define HID_SCH_STATISTIK_VARIANT "CHART2_HID_SCH_STATISTIK_VARIANT"
+ #define HID_SCH_STATISTIK_SIGMA "CHART2_HID_SCH_STATISTIK_SIGMA"
+ #define HID_SCH_STATISTIK_PERCENT "CHART2_HID_SCH_STATISTIK_PERCENT"
+ #define HID_SCH_STATISTIK_BIGERROR "CHART2_HID_SCH_STATISTIK_BIGERROR"
+ #define HID_SCH_STATISTIK_CONSTERROR "CHART2_HID_SCH_STATISTIK_CONSTERROR"
+ #define HID_SCH_STATISTIK_PERCENT_VALUE "CHART2_HID_SCH_STATISTIK_PERCENT_VALUE"
+ #define HID_SCH_STATISTIK_BIGERROR_VALUE "CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE"
+ #define HID_SCH_STATISTIK_PLUS_VALUE "CHART2_HID_SCH_STATISTIK_PLUS_VALUE"
+ #define HID_SCH_STATISTIK_MINUS_VALUE "CHART2_HID_SCH_STATISTIK_MINUS_VALUE"
+
+ #define HID_SCH_DATALABEL_VALUE "CHART2_HID_SCH_DATALABEL_VALUE"
+ #define HID_SCH_DATALABEL_NUMBER "CHART2_HID_SCH_DATALABEL_NUMBER"
+ #define HID_SCH_DATALABEL_PERCENT "CHART2_HID_SCH_DATALABEL_PERCENT"
+ #define HID_SCH_DATALABEL_TEXT "CHART2_HID_SCH_DATALABEL_TEXT"
+ #define HID_SCH_DATALABEL_SYMBOL "CHART2_HID_SCH_DATALABEL_SYMBOL"
+ #define HID_SCH_PB_NUMBERFORMAT "CHART2_HID_SCH_PB_NUMBERFORMAT"
+ #define HID_SCH_PB_PERCENT_NUMBERFORMAT "CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT"
+ #define HID_SCH_DATALABEL_SEPARATOR "CHART2_HID_SCH_DATALABEL_SEPARATOR"
+ #define HID_SCH_DATALABEL_PLACEMENT "CHART2_HID_SCH_DATALABEL_PLACEMENT"
+ #define HID_SCH_TEXTDIRECTION "CHART2_HID_SCH_TEXTDIRECTION"
+ #define HID_SCH_TEXTDIRECTION_TITLE "CHART2_HID_SCH_TEXTDIRECTION_TITLE"
+ #define HID_SCH_TEXTDIRECTION_EQUATION "CHART2_HID_SCH_TEXTDIRECTION_EQUATION"
+ #define HID_SCH_DATALABEL_ROTATION_KNOB "CHART2_HID_SCH_DATALABEL_ROTATION_KNOB"
+ #define HID_SCH_DATALABEL_ROTATION_EDIT "CHART2_HID_SCH_DATALABEL_ROTATION_EDIT"
+
+ #define HID_SCH_TITLE_MAIN "CHART2_HID_SCH_TITLE_MAIN"
+ #define HID_SCH_TITLE_SUB "CHART2_HID_SCH_TITLE_SUB"
+ #define HID_SCH_TITLE_X "CHART2_HID_SCH_TITLE_X"
+ #define HID_SCH_TITLE_Y "CHART2_HID_SCH_TITLE_Y"
+ #define HID_SCH_TITLE_Z "CHART2_HID_SCH_TITLE_Z"
+ #define HID_SCH_TITLE_SECONDARY_X "CHART2_HID_SCH_TITLE_SECONDARY_X"
+ #define HID_SCH_TITLE_SECONDARY_Y "CHART2_HID_SCH_TITLE_SECONDARY_Y"
+
+ #define HID_SCH_WIZARD_ROADMAP "CHART2_HID_SCH_WIZARD_ROADMAP"
+ #define HID_SCH_LEGEND_SHOW "CHART2_HID_SCH_LEGEND_SHOW"
+ #define HID_SCH_DATA_SERIES_LABEL "CHART2_HID_SCH_DATA_SERIES_LABEL"
+
+ #define HID_SCH_STARTING_ANGLE_DIAL "CHART2_HID_SCH_STARTING_ANGLE_DIAL"
+
+ #define HID_SCH_TRENDLINE_RB_NONE "CHART2_HID_SCH_TRENDLINE_RB_NONE"
+ #define HID_SCH_TRENDLINE_RB_LINEAR "CHART2_HID_SCH_TRENDLINE_RB_LINEAR"
+ #define HID_SCH_TRENDLINE_RB_LOGARITHMIC "CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC"
+ #define HID_SCH_TRENDLINE_RB_EXPONENTIAL "CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL"
+ #define HID_SCH_TRENDLINE_RB_POWER "CHART2_HID_SCH_TRENDLINE_RB_POWER"
+ #define HID_SCH_TRENDLINE_SHOW_EQUATION "CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION"
+ #define HID_SCH_TRENDLINE_SHOW_R_SQUARED "CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED"
+
+ #define HID_SCH_STATISTIK_FUNCTION "CHART2_HID_SCH_STATISTIK_FUNCTION"
+ #define HID_SCH_STATISTIK_RANGE "CHART2_HID_SCH_STATISTIK_RANGE"
+ #define HID_SCH_STATISTIK_FUNCTION_LB "CHART2_HID_SCH_STATISTIK_FUNCTION_LB"
+ #define HID_SCH_STATISTIK_POSITIVE_VALUE "CHART2_HID_SCH_STATISTIK_POSITIVE_VALUE"
+ #define HID_SCH_STATISTIK_POSITIVE_RANGE "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE"
+ #define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER"
+ #define HID_SCH_STATISTIK_NEGATIVE_VALUE "CHART2_HID_SCH_STATISTIK_NEGATIVE_VALUE"
+ #define HID_SCH_STATISTIK_NEGATIVE_RANGE "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE"
+ #define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER"
+ #define HID_SCH_STATISTIK_SAME_FOR_BOTH "CHART2_HID_SCH_STATISTIK_SAME_FOR_BOTH"
+ #define HID_SCH_STATISTIK_SHOW_BOTH "CHART2_HID_SCH_STATISTIK_SHOW_BOTH"
+ #define HID_SCH_STATISTIK_SHOW_POSITIVE "CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE"
+ #define HID_SCH_STATISTIK_SHOW_NEGATIVE "CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE"
+
+ #define HID_INSERT_GRIDS "CHART2_HID_INSERT_GRIDS"
+
+ #define HID_DIAGRAM_TYPE "CHART2_HID_DIAGRAM_TYPE"
+ #define HID_3D_VIEW "CHART2_HID_3D_VIEW"
+ #define HID_DIAGRAM_DATA "CHART2_HID_DIAGRAM_DATA"
+ #define HID_INSERT_AXIS "CHART2_HID_INSERT_AXIS"
+ #define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS"
+ #define HID_INSERT_TITLE "CHART2_HID_INSERT_TITLE"
+ #define HID_INSERT_CHART_LEGEND "CHART2_HID_INSERT_CHART_LEGEND"
+ #define HID_INSERT_DESCRIPTION "CHART2_HID_INSERT_DESCRIPTION"
-
#endif
diff --cc chart2/source/controller/itemsetwrapper/makefile.mk
index 8f12443,756347f..eb1deff
--- a/chart2/source/controller/itemsetwrapper/makefile.mk
+++ b/chart2/source/controller/itemsetwrapper/makefile.mk
@@@ -24,12 -24,12 +24,12 @@@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJINC= $(PRJ)$/source
--PRJNAME= chart2
--TARGET= chcitemsetwrapper
++PRJ= ..$/..$/..
++PRJINC= $(PRJ)$/source
++PRJNAME= chart2
++TARGET= chcitemsetwrapper
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@@ -39,20 -39,20 +39,20 @@@
# --- export library -------------------------------------------------
#object files to build and link together to lib $(SLB)$/$(TARGET).lib
--SLOFILES= $(SLO)$/ItemConverter.obj \
- $(SLO)$/AxisItemConverter.obj \
- $(SLO)$/MultipleItemConverter.obj \
- $(SLO)$/MultipleChartConverters.obj \
- $(SLO)$/CharacterPropertyItemConverter.obj \
- $(SLO)$/SeriesOptionsItemConverter.obj \
- $(SLO)$/DataPointItemConverter.obj \
- $(SLO)$/GraphicPropertyItemConverter.obj \
- $(SLO)$/LegendItemConverter.obj \
- $(SLO)$/StatisticsItemConverter.obj \
- $(SLO)$/TitleItemConverter.obj \
- $(SLO)$/RegressionCurveItemConverter.obj \
- $(SLO)$/RegressionEquationItemConverter.obj \
- $(SLO)$/ErrorBarItemConverter.obj
- $(SLO)$/AxisItemConverter.obj \
- $(SLO)$/MultipleItemConverter.obj \
- $(SLO)$/MultipleChartConverters.obj \
- $(SLO)$/CharacterPropertyItemConverter.obj \
- $(SLO)$/SeriesOptionsItemConverter.obj \
- $(SLO)$/DataPointItemConverter.obj \
- $(SLO)$/GraphicPropertyItemConverter.obj \
- $(SLO)$/LegendItemConverter.obj \
- $(SLO)$/StatisticsItemConverter.obj \
- $(SLO)$/TitleItemConverter.obj \
- $(SLO)$/RegressionCurveItemConverter.obj \
- $(SLO)$/RegressionEquationItemConverter.obj \
- $(SLO)$/ErrorBarItemConverter.obj
++SLOFILES= $(SLO)$/ItemConverter.obj \
++ $(SLO)$/AxisItemConverter.obj \
++ $(SLO)$/MultipleItemConverter.obj \
++ $(SLO)$/MultipleChartConverters.obj \
++ $(SLO)$/CharacterPropertyItemConverter.obj \
++ $(SLO)$/SeriesOptionsItemConverter.obj \
++ $(SLO)$/DataPointItemConverter.obj \
++ $(SLO)$/GraphicPropertyItemConverter.obj \
++ $(SLO)$/LegendItemConverter.obj \
++ $(SLO)$/StatisticsItemConverter.obj \
++ $(SLO)$/TitleItemConverter.obj \
++ $(SLO)$/RegressionCurveItemConverter.obj \
++ $(SLO)$/RegressionEquationItemConverter.obj \
++ $(SLO)$/ErrorBarItemConverter.obj
# --- Targets -----------------------------------------------------------------
diff --cc chart2/source/controller/main/DrawCommandDispatch.hrc
index 2995d6c,2995d6c..0000000
deleted file mode 100644,100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hrc
+++ /dev/null
diff --cc chart2/source/controller/makefile.mk
index b8a2561,1e491a9..3e54d6e
--- a/chart2/source/controller/makefile.mk
+++ b/chart2/source/controller/makefile.mk
@@@ -109,11 -109,10 +109,9 @@@ DEF1NAME= $(SHL1TARGET
# --- Resources ---------------------------------------------------------------
- # sfx.srs is needed for the strings for UNDO and REDO in the UndoCommandDispatch
RESLIB1LIST=\
- $(SRS)$/chcdialogs.srs \
- $(SRS)$/chcmenus.srs \
-
+ $(SRS)$/chcdialogs.srs \
- $(SRS)$/chcmenus.srs \
- $(SOLARCOMMONRESDIR)$/sfx.srs
++ $(SRS)$/chcmenus.srs
RESLIB1NAME= $(TARGET)
RESLIB1IMAGES=$(PRJ)$/res
diff --cc chart2/source/inc/OPropertySet.hxx
index 1702ce7,6a22b47..87d7326
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@@ -88,35 -88,7 +88,6 @@@ protected
*/
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() = 0;
- // ____ XPropertySet ____
- /** sample implementation using the InfoHelper:
--
- <pre>
- uno::Reference< beans::XPropertySetInfo > SAL_CALL
- OPropertySet::getPropertySetInfo()
- throw (uno::RuntimeException)
- {
- static uno::Reference< beans::XPropertySetInfo > xInfo;
-
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if( !xInfo.is())
- {
- xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
- getInfoHelper());
- }
-
- return xInfo;
- }
- </pre>
-
- <p>(The reason why this isn't implemented here is, that the static
- object is only valid per concrete PropertySet. Otherwise all
- PropertySets derived from this base calss would have the same
- properties.)</p>
-
- @see ::cppu::OPropertySetHelper
- */
-
/** Try to convert the value <code>rValue</code> to the type required by the
property associated with <code>nHandle</code>.
diff --cc chart2/source/model/filter/makefile.mk
index fc9f7eb,300f235..9af4986
--- a/chart2/source/model/filter/makefile.mk
+++ b/chart2/source/model/filter/makefile.mk
@@@ -25,13 -25,13 +25,13 @@@
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJNAME= chart2
--TARGET= chmodelfilter
++PRJ= ..$/..$/..
++PRJNAME= chart2
++TARGET= chmodelfilter
--PRJINC= $(PRJ)$/source
++PRJINC= $(PRJ)$/source
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@@ -41,8 -41,8 +41,8 @@@
# --- export library -------------------------------------------------
#Specifies object files to bind into linked libraries.
--SLOFILES= \
- $(SLO)$/XMLFilter.obj
- $(SLO)$/XMLFilter.obj
++SLOFILES= \
++ $(SLO)$/XMLFilter.obj
# --- Targets -----------------------------------------------------------------
diff --cc chart2/source/model/makefile.mk
index dfb5522,171864c..ed9ef66
--- a/chart2/source/model/makefile.mk
+++ b/chart2/source/model/makefile.mk
@@@ -25,12 -25,12 +25,12 @@@
#
#*************************************************************************
--PRJ= ..$/..
--PRJNAME= chart2
--TARGET= chartmodel
++PRJ= ..$/..
++PRJNAME= chart2
++TARGET= chartmodel
--USE_DEFFILE= TRUE
--ENABLE_EXCEPTIONS= TRUE
++USE_DEFFILE= TRUE
++ENABLE_EXCEPTIONS= TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@@ -41,17 -41,17 +41,17 @@@
#You can use several library macros of this form to build libraries that
#do not consist of all object files in a directory or to merge different libraries.
--LIB1TARGET= $(SLB)$/_$(TARGET).lib
++LIB1TARGET= $(SLB)$/_$(TARGET).lib
--LIB1FILES= \
- $(SLB)$/chmodelmain.lib \
- $(SLB)$/chmodeltemplate.lib \
- $(SLB)$/chmodelfilter.lib
- $(SLB)$/chmodelmain.lib \
- $(SLB)$/chmodeltemplate.lib \
- $(SLB)$/chmodelfilter.lib
++LIB1FILES= \
++ $(SLB)$/chmodelmain.lib \
++ $(SLB)$/chmodeltemplate.lib \
++ $(SLB)$/chmodelfilter.lib
#--------
#Indicates the filename of the shared library.
--SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
++SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
#indicates dependencies:
.IF "$(COM)" == "MSC"
@@@ -62,36 -62,36 +62,36 @@@ SHL1DEPN
.ENDIF
#Specifies an import library to create. For Win32 only.
--SHL1IMPLIB= i$(TARGET)
++SHL1IMPLIB= i$(TARGET)
#Specifies libraries from the same module to put into the shared library.
#was created above
--SHL1LIBS= $(LIB1TARGET)
++SHL1LIBS= $(LIB1TARGET)
#Links import libraries.
--SHL1STDLIBS= $(CHARTTOOLS) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(SALLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(SALLIB) \
- $(UCBHELPERLIB)
++SHL1STDLIBS= $(CHARTTOOLS) \
++ $(CPPULIB) \
++ $(CPPUHELPERLIB) \
++ $(COMPHELPERLIB) \
++ $(UNOTOOLSLIB) \
++ $(VCLLIB) \
++ $(SVLLIB) \
++ $(SVTOOLLIB) \
++ $(SALLIB) \
+ $(UCBHELPERLIB)
#--------exports
#specifies the exported symbols for Windows only:
--SHL1DEF= $(MISC)$/$(SHL1TARGET).def
++SHL1DEF= $(MISC)$/$(SHL1TARGET).def
SHL1VERSIONMAP = $(SOLARENV)/src/component.map
#--------definition file
#name of the definition file:
--DEF1NAME= $(SHL1TARGET)
++DEF1NAME= $(SHL1TARGET)
# --- Resources ---------------------------------------------------------------
diff --cc chart2/source/model/template/makefile.mk
index 5599aed,8b8b3a0..503e92f
--- a/chart2/source/model/template/makefile.mk
+++ b/chart2/source/model/template/makefile.mk
@@@ -25,13 -25,13 +25,13 @@@
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJNAME= chart2
--TARGET= chmodeltemplate
++PRJ= ..$/..$/..
++PRJNAME= chart2
++TARGET= chmodeltemplate
--PRJINC= $(PRJ)$/source
++PRJINC= $(PRJ)$/source
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@@ -41,41 -41,41 +41,41 @@@
# i26518 the gcc-3.0.4 requires to enhance the template-depth
# this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
.IF "$(COM)"=="GCC"
- CFLAGS+=-ftemplate-depth-128
- CFLAGS+=-ftemplate-depth-128
++ CFLAGS+=-ftemplate-depth-128
.ENDIF
# --- export library -------------------------------------------------
#Specifies object files to bind into linked libraries.
--SLOFILES= \
- $(SLO)$/AreaChartType.obj \
- $(SLO)$/AreaChartTypeTemplate.obj \
- $(SLO)$/BarChartType.obj \
- $(SLO)$/BarChartTypeTemplate.obj \
- $(SLO)$/CandleStickChartType.obj \
- $(SLO)$/ChartType.obj \
- $(SLO)$/ChartTypeManager.obj \
- $(SLO)$/ChartTypeTemplate.obj \
- $(SLO)$/ColumnChartType.obj \
- $(SLO)$/ColumnLineChartTypeTemplate.obj \
- $(SLO)$/DataInterpreter.obj \
- $(SLO)$/FilledNetChartType.obj \
- $(SLO)$/LineChartType.obj \
- $(SLO)$/LineChartTypeTemplate.obj \
- $(SLO)$/NetChartType.obj \
- $(SLO)$/NetChartTypeTemplate.obj \
- $(SLO)$/PieChartType.obj \
- $(SLO)$/PieChartTypeTemplate.obj \
- $(SLO)$/ScatterChartType.obj \
- $(SLO)$/ScatterChartTypeTemplate.obj \
- $(SLO)$/BubbleChartType.obj \
- $(SLO)$/BubbleChartTypeTemplate.obj \
- $(SLO)$/BubbleDataInterpreter.obj \
- $(SLO)$/StockChartTypeTemplate.obj \
- $(SLO)$/StockDataInterpreter.obj \
- $(SLO)$/XYDataInterpreter.obj \
- $(SLO)$/ColumnLineDataInterpreter.obj \
- $(SLO)$/_serviceregistration_charttypes.obj
- $(SLO)$/AreaChartType.obj \
- $(SLO)$/AreaChartTypeTemplate.obj \
- $(SLO)$/BarChartType.obj \
- $(SLO)$/BarChartTypeTemplate.obj \
- $(SLO)$/CandleStickChartType.obj \
- $(SLO)$/ChartType.obj \
- $(SLO)$/ChartTypeManager.obj \
- $(SLO)$/ChartTypeTemplate.obj \
- $(SLO)$/ColumnChartType.obj \
- $(SLO)$/ColumnLineChartTypeTemplate.obj \
- $(SLO)$/DataInterpreter.obj \
- $(SLO)$/FilledNetChartType.obj \
- $(SLO)$/LineChartType.obj \
- $(SLO)$/LineChartTypeTemplate.obj \
- $(SLO)$/NetChartType.obj \
- $(SLO)$/NetChartTypeTemplate.obj \
- $(SLO)$/PieChartType.obj \
- $(SLO)$/PieChartTypeTemplate.obj \
- $(SLO)$/ScatterChartType.obj \
- $(SLO)$/ScatterChartTypeTemplate.obj \
- $(SLO)$/BubbleChartType.obj \
- $(SLO)$/BubbleChartTypeTemplate.obj \
- $(SLO)$/BubbleDataInterpreter.obj \
- $(SLO)$/StockChartTypeTemplate.obj \
- $(SLO)$/StockDataInterpreter.obj \
- $(SLO)$/XYDataInterpreter.obj \
- $(SLO)$/ColumnLineDataInterpreter.obj \
- $(SLO)$/_serviceregistration_charttypes.obj
++SLOFILES= \
++ $(SLO)$/AreaChartType.obj \
++ $(SLO)$/AreaChartTypeTemplate.obj \
++ $(SLO)$/BarChartType.obj \
++ $(SLO)$/BarChartTypeTemplate.obj \
++ $(SLO)$/CandleStickChartType.obj \
++ $(SLO)$/ChartType.obj \
++ $(SLO)$/ChartTypeManager.obj \
++ $(SLO)$/ChartTypeTemplate.obj \
++ $(SLO)$/ColumnChartType.obj \
++ $(SLO)$/ColumnLineChartTypeTemplate.obj \
++ $(SLO)$/DataInterpreter.obj \
++ $(SLO)$/FilledNetChartType.obj \
++ $(SLO)$/LineChartType.obj \
++ $(SLO)$/LineChartTypeTemplate.obj \
++ $(SLO)$/NetChartType.obj \
++ $(SLO)$/NetChartTypeTemplate.obj \
++ $(SLO)$/PieChartType.obj \
++ $(SLO)$/PieChartTypeTemplate.obj \
++ $(SLO)$/ScatterChartType.obj \
++ $(SLO)$/ScatterChartTypeTemplate.obj \
++ $(SLO)$/BubbleChartType.obj \
++ $(SLO)$/BubbleChartTypeTemplate.obj \
++ $(SLO)$/BubbleDataInterpreter.obj \
++ $(SLO)$/StockChartTypeTemplate.obj \
++ $(SLO)$/StockDataInterpreter.obj \
++ $(SLO)$/XYDataInterpreter.obj \
++ $(SLO)$/ColumnLineDataInterpreter.obj \
++ $(SLO)$/_serviceregistration_charttypes.obj
# --- Targets -----------------------------------------------------------------
diff --cc chart2/source/view/charttypes/makefile.mk
index b6cb14e,0a44339..f4550a7
--- a/chart2/source/view/charttypes/makefile.mk
+++ b/chart2/source/view/charttypes/makefile.mk
@@@ -25,12 -25,12 +25,12 @@@
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJINC= $(PRJ)$/source
--PRJNAME= chart2
--TARGET= chvtypes
++PRJ= ..$/..$/..
++PRJINC= $(PRJ)$/source
++PRJNAME= chart2
++TARGET= chvtypes
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
# --- Settings -----------------------------------------------------
@@@ -41,14 -41,14 +41,14 @@@
#object files to build and link together to lib $(SLB)$/$(TARGET).lib
SLOFILES = $(SLO)$/Splines.obj \
- $(SLO)$/CategoryPositionHelper.obj \
- $(SLO)$/BarPositionHelper.obj \
- $(SLO)$/VSeriesPlotter.obj \
- $(SLO)$/BarChart.obj \
- $(SLO)$/PieChart.obj \
- $(SLO)$/AreaChart.obj \
- $(SLO)$/CandleStickChart.obj \
- $(SLO)$/BubbleChart.obj
- $(SLO)$/CategoryPositionHelper.obj \
- $(SLO)$/BarPositionHelper.obj \
- $(SLO)$/VSeriesPlotter.obj \
- $(SLO)$/BarChart.obj \
- $(SLO)$/PieChart.obj \
- $(SLO)$/AreaChart.obj \
- $(SLO)$/CandleStickChart.obj \
- $(SLO)$/BubbleChart.obj
++ $(SLO)$/CategoryPositionHelper.obj \
++ $(SLO)$/BarPositionHelper.obj \
++ $(SLO)$/VSeriesPlotter.obj \
++ $(SLO)$/BarChart.obj \
++ $(SLO)$/PieChart.obj \
++ $(SLO)$/AreaChart.obj \
++ $(SLO)$/CandleStickChart.obj \
++ $(SLO)$/BubbleChart.obj
# --- Targets -----------------------------------------------------------------
diff --cc chart2/source/view/main/makefile.mk
index ec9c99f,eae22a4..b70e5e2
--- a/chart2/source/view/main/makefile.mk
+++ b/chart2/source/view/main/makefile.mk
@@@ -25,12 -25,12 +25,12 @@@
#
#*************************************************************************
--PRJ= ..$/..$/..
--PRJINC= $(PRJ)$/source
--PRJNAME= chart2
--TARGET= chview
++PRJ= ..$/..$/..
++PRJINC= $(PRJ)$/source
++PRJNAME= chart2
++TARGET= chview
--ENABLE_EXCEPTIONS= TRUE
++ENABLE_EXCEPTIONS= TRUE
# --- Settings -----------------------------------------------------
@@@ -45,7 -45,7 +45,7 @@@ SLOFILES =
$(SLO)$/DrawModelWrapper.obj \
$(SLO)$/NumberFormatterWrapper.obj \
$(SLO)$/PropertyMapper.obj \
- $(SLO)$/Stripe.obj \
- $(SLO)$/Stripe.obj \
++ $(SLO)$/Stripe.obj \
$(SLO)$/VLineProperties.obj \
$(SLO)$/ShapeFactory.obj \
$(SLO)$/VLegendSymbolFactory.obj \
@@@ -56,12 -56,12 +56,12 @@@
$(SLO)$/PlottingPositionHelper.obj \
$(SLO)$/LabelPositionHelper.obj \
$(SLO)$/PolarLabelPositionHelper.obj \
- $(SLO)$/PlotterBase.obj \
- $(SLO)$/PlotterBase.obj \
++ $(SLO)$/PlotterBase.obj \
$(SLO)$/VDataSeries.obj \
$(SLO)$/VLegend.obj \
$(SLO)$/VTitle.obj \
$(SLO)$/ChartView.obj \
- $(SLO)$/_serviceregistration_view.obj
- $(SLO)$/_serviceregistration_view.obj
++ $(SLO)$/_serviceregistration_view.obj
# --- Targets -----------------------------------------------------------------
diff --cc chart2/source/view/makefile.mk
index aa3c149,bdd73f8..804fb83
--- a/chart2/source/view/makefile.mk
+++ b/chart2/source/view/makefile.mk
@@@ -25,12 -25,12 +25,12 @@@
#
#*************************************************************************
--PRJ= ..$/..
--PRJNAME= chart2
--TARGET= chartview
++PRJ= ..$/..
++PRJNAME= chart2
++TARGET= chartview
--USE_DEFFILE= TRUE
--ENABLE_EXCEPTIONS= TRUE
++USE_DEFFILE= TRUE
++ENABLE_EXCEPTIONS= TRUE
# --- Settings -----------------------------------------------------
@@@ -41,9 -41,9 +41,9 @@@
#You can use several library macros of this form to build libraries that
#do not consist of all object files in a directory or to merge different libraries.
--LIB1TARGET= $(SLB)$/$(TARGET).lib
++LIB1TARGET= $(SLB)$/$(TARGET).lib
--LIB1FILES= \
++LIB1FILES= \
$(SLB)$/chvaxes.lib \
$(SLB)$/chvtypes.lib \
$(SLB)$/chvdiagram.lib \
@@@ -52,7 -52,7 +52,7 @@@
#--------
#Indicates the filename of the shared library.
--SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
++SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
#indicates dependencies:
.IF "$(COM)" == "MSC"
@@@ -63,51 -63,51 +63,51 @@@ SHL1DEPN
.ENDIF
#Specifies an import library to create. For Win32 only.
--SHL1IMPLIB= i$(TARGET)
++SHL1IMPLIB= i$(TARGET)
#Specifies libraries from the same module to put into the shared library.
#was created above
--SHL1LIBS= $(LIB1TARGET)
++SHL1LIBS= $(LIB1TARGET)
#Links import libraries.
--SHL1STDLIBS= $(CHARTTOOLS) \
-- $(CPPULIB) \
-- $(EDITENGLIB) \
-- $(CPPUHELPERLIB) \
-- $(COMPHELPERLIB) \
-- $(SALLIB) \
-- $(SVLLIB) \
-- $(SVTOOLLIB) \
-- $(SVXCORELIB) \
-- $(TOOLSLIB) \
++SHL1STDLIBS= $(CHARTTOOLS) \
++ $(CPPULIB) \
++ $(EDITENGLIB) \
++ $(CPPUHELPERLIB) \
++ $(COMPHELPERLIB) \
++ $(SALLIB) \
++ $(SVLLIB) \
++ $(SVTOOLLIB) \
++ $(SVXCORELIB) \
++ $(TOOLSLIB) \
$(UNOTOOLSLIB) \
-- $(BASEGFXLIB) \
++ $(BASEGFXLIB) \
$(VCLLIB) \
-- $(SFXLIB) \
++ $(SFXLIB) \
$(BASEGFXLIB)
#--------exports
#specifies the exported symbols for Windows only:
--SHL1DEF= $(MISC)$/$(SHL1TARGET).def
++SHL1DEF= $(MISC)$/$(SHL1TARGET).def
#Specifies the library name to parse for symbols. For Win32 only.
--DEFLIB1NAME= $(TARGET)
++DEFLIB1NAME= $(TARGET)
#A file of symbols to export.
--#DEF1EXPORTFILE= $(PRJ)$/source$/inc$/exports.dxp
++#DEF1EXPORTFILE= $(PRJ)$/source$/inc$/exports.dxp
#--------definition file
#name of the definition file:
--DEF1NAME= $(SHL1TARGET)
++DEF1NAME= $(SHL1TARGET)
# indicates definition file dependencies
--DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
++DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
#A comment on the definition file.
--DEF1DES= Viewable Component Chart View
++DEF1DES= Viewable Component Chart View
# --- Targets -----------------------------------------------------------------
@@@ -116,5 -116,13 +116,13 @@@
# --- Filter -----------------------------------------------------------
$(MISC)$/$(SHL1TARGET).flt: makefile.mk \
- exports.flt
- $(TYPE) exports.flt > $@
- exports.flt
- $(TYPE) exports.flt > $@
++ exports.flt
++ $(TYPE) exports.flt > $@
+
+ ALLTAR : $(MISC)/chartview.component
+
+ $(MISC)/chartview.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ chartview.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt chartview.component
diff --cc chart2/util/makefile.mk
index dff1467,943e4ad..63485ed
--- a/chart2/util/makefile.mk
+++ b/chart2/util/makefile.mk
@@@ -38,7 -38,7 +38,7 @@@ TARGET=chart_d
#-------------------------------------------------------------------
# UNOIDLDBFILES= \
--# $(UCR)$/csschart2.db
++# $(UCR)$/csschart2.db
# --- Targets ------------------------------------------------------
@@@ -46,15 -46,15 +46,15 @@@
.IF "$(L10N_framewor)"==""
ALLTAR : \
- $(BIN)$/$(PRJNAME).rdb \
- $(MISC)$/$(TARGET).don
- $(BIN)$/$(PRJNAME).rdb \
- $(MISC)$/$(TARGET).don
++ $(BIN)$/$(PRJNAME).rdb \
++ $(MISC)$/$(TARGET).don
$(BIN)$/$(PRJNAME).rdb : $(UCR)$/$(PRJNAME).db
- $(GNUCOPY) -f $(UCR)$/$(PRJNAME).db $@
- $(GNUCOPY) -f $(UCR)$/$(PRJNAME).db $@
++ $(GNUCOPY) -f $(UCR)$/$(PRJNAME).db $@
$(MISC)$/$(TARGET).don : $(UCR)$/$(PRJNAME).db
- $(CPPUMAKER) -O$(OUT)$/inc -BUCR $(UCR)$/$(PRJNAME).db -X$(SOLARBINDIR)$/types.rdb && echo > $@
- echo $@
- $(CPPUMAKER) -O$(OUT)$/inc -BUCR $(UCR)$/$(PRJNAME).db -X$(SOLARBINDIR)$/types.rdb && echo > $@
- echo $@
++ $(CPPUMAKER) -O$(OUT)$/inc -BUCR $(UCR)$/$(PRJNAME).db -X$(SOLARBINDIR)$/types.rdb && echo > $@
++ echo $@
--.ENDIF # "$(L10N_framewor)"==""
++.ENDIF # "$(L10N_framewor)"==""
diff --cc sc/addin/datefunc/makefile.mk
index f781b38,d121669..d67434b
--- a/sc/addin/datefunc/makefile.mk
+++ b/sc/addin/datefunc/makefile.mk
@@@ -47,7 -47,7 +47,7 @@@ CFILES= $(MISC)$/x$(TARGET).
#VERSIONOBJ=
SLOFILES= \
- $(SLO)$/x$(TARGET).obj
- $(SLO)$/x$(TARGET).obj
++ $(SLO)$/x$(TARGET).obj
# ==========================================================================
@@@ -58,7 -58,7 +58,7 @@@ SHL1DEF= $(MISC)$/$(SHL1TARGET).de
.IF "$(GUI)" == "WNT"
SHL1STDLIBS= $(GDI32LIB) $(ADVAPI32LIB) $(COMDLG32LIB) \
- $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
- $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
++ $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
.IF "$(GVER)" == "W40"
SHL1STDLIBS= $(SHL1STDLIBS) $(COMCTL32LIB)
.ENDIF
@@@ -66,17 -66,17 +66,17 @@@
# --- Targets -------------------------------------------------------
--ALLTAR: $(MISC)$/$(TARGET).lst
-
-
++ALLTAR: $(MISC)$/$(TARGET).lst
++
.INCLUDE: target.mk
$(MISC)$/x$(TARGET).c: $(TARGET).cl $(CL2CSRC)
- $(CL2C) $(TARGET).cl $(MISC)$/x$(TARGET).c $(CL2CSRC) $(CL2CRID)
- $(CL2C) $(TARGET).cl $(MISC)$/x$(TARGET).c $(CL2CSRC) $(CL2CRID)
++ $(CL2C) $(TARGET).cl $(MISC)$/x$(TARGET).c $(CL2CSRC) $(CL2CRID)
# copy file to include in package
$(INCCOM)$/xlang.h : $(SOLARINCDIR)$/i18npool$/lang.h
- @$(COPY) $(SOLARINCDIR)$/i18npool$/lang.h $@
- @$(COPY) $(SOLARINCDIR)$/i18npool$/lang.h $@
++ @$(COPY) $(SOLARINCDIR)$/i18npool$/lang.h $@
$(SLOFILES) : $(INCCOM)$/xlang.h $(CFILES)
diff --cc sc/addin/makefile.mk
index e716a8d,94784bd..4dcd30b
--- a/sc/addin/makefile.mk
+++ b/sc/addin/makefile.mk
@@@ -39,7 -39,7 +39,7 @@@ TARGET=addi
.INCLUDE: target.mk
ALLTAR: $(MISC)$/cl2c.pl
-
-
++
$(MISC)$/cl2c.pl: util/cl2c.pl
- tr -d "\015" < util$/cl2c.pl > $@
- chmod +rw $@
+ tr -d "\015" < util$/cl2c.pl > $@
+ chmod +rw $@
diff --cc sc/addin/rot13/makefile.mk
index a33c50d,fa64387..04fb684
--- a/sc/addin/rot13/makefile.mk
+++ b/sc/addin/rot13/makefile.mk
@@@ -45,7 -45,7 +45,7 @@@ CL2CSRC=$(TARGET)13.sr
CFILES= $(MISC)$/x$(TARGET).c
SLOFILES= \
- $(SLO)$/x$(TARGET).obj
- $(SLO)$/x$(TARGET).obj
++ $(SLO)$/x$(TARGET).obj
# ==========================================================================
@@@ -59,7 -59,7 +59,7 @@@ DEF1NAME=$(SHL1TARGET
.IF "$(GUI)" == "WNT"
SHL1STDLIBS= $(GDI32LIB) $(ADVAPI32LIB) $(COMDLG32LIB) \
- $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
- $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
++ $(UUIDLIB) $(OLE32LIB) $(SHELL32LIB) $(WINSPOOLLIB)
.IF "$(GVER)" == "W40"
SHL1STDLIBS= $(SHL1STDLIBS) $(COMCTL32LIB)
.ENDIF # W40
@@@ -67,16 -67,16 +67,16 @@@
# --- Targets -------------------------------------------------------
--ALLTAR: $(MISC)$/rot.lst
++ALLTAR: $(MISC)$/rot.lst
.INCLUDE: target.mk
$(MISC)$/x$(TARGET).c: $(TARGET)13.cl $(CL2CSRC) $(MISC)$/cl2c.pl
- $(CL2C) $(TARGET)13.cl $(MISC)$/x$(TARGET).c $(CL2CSRC) $(CL2CRID)
- $(CL2C) $(TARGET)13.cl $(MISC)$/x$(TARGET).c $(CL2CSRC) $(CL2CRID)
++ $(CL2C) $(TARGET)13.cl $(MISC)$/x$(TARGET).c $(CL2CSRC) $(CL2CRID)
# copy file to include in package
$(INCCOM)$/xlang.h : $(SOLARINCDIR)$/i18npool$/lang.h
- @$(COPY) $(SOLARINCDIR)$/i18npool$/lang.h $@
- @$(COPY) $(SOLARINCDIR)$/i18npool$/lang.h $@
++ @$(COPY) $(SOLARINCDIR)$/i18npool$/lang.h $@
$(SLOFILES) : $(INCCOM)$/xlang.h $(CFILES)
diff --cc sc/inc/dpobject.hxx
index e33a11a,a08c7b4..ca53cd8
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@@ -260,7 -260,7 +260,6 @@@ public
static bool IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags );
};
--
// ============================================================================
class ScDPCollection
diff --cc sc/inc/makefile.mk
index a3bcf29,8f59a0b..b3f2208
--- a/sc/inc/makefile.mk
+++ b/sc/inc/makefile.mk
@@@ -41,8 -41,8 +41,8 @@@ TARGET=in
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
- .ENDIF # "$(ENABLE_PCH)"!=""
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
++ $(SLO)$/precompiled.pch \
++ $(SLO)$/precompiled_ex.pch
++
++.ENDIF # "$(ENABLE_PCH)"!=""
diff --cc sc/inc/pch/precompiled_sc.hxx
index a5c626f,0432874..b48a3c2
mode 100644,100755..100755
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
diff --cc sc/inc/sc.hrc
index d684d05,9dccb4a..2d01291
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@@ -1328,9 -962,11 +962,10 @@@
#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)
#define SCSTR_WARN_ME_IN_FUTURE_CHECK (STR_START + 217)
-
-#define SCSTR_PRINT_OPTIONS (STR_START+216)
++#define SCSTR_PRINT_OPTIONS (STR_START + 218)
// Navigator - in der Reihenfolge wie SC_CONTENT_...
#define SCSTR_CONTENT_ROOT (STR_START + 250)
@@@ -1623,4 -1261,4 +1258,3 @@@
#define HID_SCPAGE_COMPATIBILITY (SC_OOO_BUILD_START + 10)
#endif
--
diff --cc sc/qa/complex/calcPreview/makefile.mk
index 14f9428,aa84e7c..a104b71
--- a/sc/qa/complex/calcPreview/makefile.mk
+++ b/sc/qa/complex/calcPreview/makefile.mk
@@@ -25,69 -25,99 +25,99 @@@
#
#*************************************************************************
- PRJ = ..$/..$/..
- TARGET = ViewForward
- PRJNAME = $(TARGET)
- PACKAGE = complex$/calcPreview
-
- # --- Settings -----------------------------------------------------
- .INCLUDE: settings.mk
-
-
- #----- compile .java files -----------------------------------------
-
- JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
- JAVAFILES = ViewForwarder.java
- JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
- #----- make a jar from compiled files ------------------------------
-
- MAXLINELENGTH = 100000
-
- JARCLASSDIRS = $(PACKAGE)
- JARTARGET = $(TARGET).jar
- JARCOMPRESS = TRUE
-
- # --- Parameters for the test --------------------------------------
-
- # start an office if the parameter is set for the makefile
- .IF "$(OFFICE)" == ""
- CT_APPEXECCOMMAND =
+ .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+ nothing .PHONY:
.ELSE
- CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
- .ENDIF
- # test base is java complex
- CT_TESTBASE = -TestBase java_complex
+ PRJ = ../../..
+ PRJNAME = sc
+ TARGET = qa_complex_calcpreview
- # set test document path
- CT_TESTDOCS = -tdoc $(PWD)$/test_documents
+ .IF "$(OOO_JUNIT_JAR)" != ""
+ PACKAGE = complex/calcPreview
+ JAVATESTFILES = \
- TestDocument.java \
++ TestDocument.java \
+ ViewForwarder.java
- # test looks something like the.full.package.TestName
- CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+ JAVAFILES = $(JAVATESTFILES)
+ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar
+ EXTRAJARFILES = $(OOO_JUNIT_JAR)
+ .END
- # start the runner application
- CT_APP = org.openoffice.Runner
-
- # set the timeout to a bigger value
- CT_TIMEOUT = -TimeOut 120000
-
- # --- Targets ------------------------------------------------------
-
- .IF "$(depend)" == ""
- $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
- .ELSE
- $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
- .ENDIF
+ .INCLUDE: settings.mk
+ .INCLUDE: target.mk
+ .INCLUDE: installationtest.mk
- .INCLUDE : target.mk
+ ALLTAR : javatest
+ .END
- RUN:
- +java -cp "$(CLASSPATH)" $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTDOCS) $(CT_TESTBASE) $(CT_WORKDIR) $(CT_TIMEOUT) $(CT_TEST)
- run: RUN
- tst:
- + at echo $(CT_TESTDOCS)
+ # PRJ = ..$/..$/..
+ # TARGET = ViewForward
+ # PRJNAME = $(TARGET)
+ # PACKAGE = complex$/calcPreview
+ #
+ # # --- Settings -----------------------------------------------------
+ # .INCLUDE: settings.mk
+ #
+ #
+ # #----- compile .java files -----------------------------------------
+ #
+ # JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+ # JAVAFILES = ViewForwarder.java
-# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
++# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+ #
+ # #----- make a jar from compiled files ------------------------------
+ #
+ # MAXLINELENGTH = 100000
+ #
+ # JARCLASSDIRS = $(PACKAGE)
+ # JARTARGET = $(TARGET).jar
-# JARCOMPRESS = TRUE
++# JARCOMPRESS = TRUE
+ #
+ # # --- Parameters for the test --------------------------------------
+ #
+ # # start an office if the parameter is set for the makefile
+ # .IF "$(OFFICE)" == ""
+ # CT_APPEXECCOMMAND =
+ # .ELSE
+ # CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
+ # .ENDIF
+ #
+ # # test base is java complex
+ # CT_TESTBASE = -TestBase java_complex
+ #
+ # # set test document path
+ # CT_TESTDOCS = -tdoc $(PWD)$/test_documents
+ #
+ # # test looks something like the.full.package.TestName
+ # CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+ #
+ # # start the runner application
+ # CT_APP = org.openoffice.Runner
+ #
+ # # set the timeout to a bigger value
+ # CT_TIMEOUT = -TimeOut 120000
+ #
+ # # --- Targets ------------------------------------------------------
+ #
+ # .IF "$(depend)" == ""
+ # $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR
+ # .ELSE
+ # $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP
+ # .ENDIF
+ #
+ # .INCLUDE : target.mk
+ #
+ #
+ # RUN:
+ # +java -cp "$(CLASSPATH)" $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTDOCS) $(CT_TESTBASE) $(CT_WORKDIR) $(CT_TIMEOUT) $(CT_TEST)
+ #
+ # run: RUN
+ #
+ # tst:
-# + at echo $(CT_TESTDOCS)
++# + at echo $(CT_TESTDOCS)
+ #
diff --cc sc/qa/complex/dataPilot/makefile.mk
index a0bf1df,35a974b..8fe1440
--- a/sc/qa/complex/dataPilot/makefile.mk
+++ b/sc/qa/complex/dataPilot/makefile.mk
@@@ -25,34 -25,35 +25,35 @@@
#
#*************************************************************************
- PRJ = ..$/..$/..
- TARGET = DataPilot
- PRJNAME = sc
- PACKAGE = complex$/dataPilot
-
- # --- Settings -----------------------------------------------------
- .INCLUDE: settings.mk
+ .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+ nothing .PHONY:
+ .ELSE
+ PRJ = ../../..
+ PRJNAME = sc
+ TARGET = qa_complex_datapilot
- #----- compile .java files -----------------------------------------
-
- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
- JAVAFILES = CheckDataPilot.java
- JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+ .IF "$(OOO_JUNIT_JAR)" != ""
+ PACKAGE = complex/dataPilot
+ JAVATESTFILES = \
+ CheckDataPilot.java
- SUBDIRS = interfaceTests$/beans interfaceTests$/container interfaceTests$/sheet
- #----- make a jar from compiled files ------------------------------
+ JAVAFILES = $(JAVATESTFILES) \
- _XDataPilotDescriptor.java \
- _XDataPilotTable.java \
- _XNamed.java \
- _XPropertySet.java
++ _XDataPilotDescriptor.java \
++ _XDataPilotTable.java \
++ _XNamed.java \
++ _XPropertySet.java
- MAXLINELENGTH = 100000
+ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+ EXTRAJARFILES = $(OOO_JUNIT_JAR)
- JARCLASSDIRS = $(PACKAGE)
- JARTARGET = $(TARGET).jar
- JARCOMPRESS = TRUE
+ .END
- # --- Targets ------------------------------------------------------
+ .INCLUDE: settings.mk
+ .INCLUDE: target.mk
+ .INCLUDE: installationtest.mk
- .INCLUDE : target.mk
+ ALLTAR : javatest
+ .END
- run:
- +java -cp $(CLASSPATH) org.openoffice.Runner -TimeOut 0 -tb java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b)
diff --cc sc/source/core/data/column3.cxx
index 1183341,36ff014..958fa07
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@@ -1273,14 -1273,14 +1273,16 @@@ bool ScColumn::SetString( SCROW nRow, S
BOOL bIsLoading = FALSE;
if (rString.Len() > 0)
{
- double nVal;
+ ScSetStringParam aParam;
+ if (pParam)
+ aParam = *pParam;
+
sal_uInt32 nIndex, nOldIndex = 0;
sal_Unicode cFirstChar;
- // #i110979# If a different NumberFormatter is passed in (pLangFormatter),
- // its formats aren't valid in the document.
- // Only use the language / LocaleDataWrapper from pLangFormatter,
- // always the document's number formatter for IsNumberFormat.
- SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
++
+ if (!aParam.mpNumFormatter)
+ aParam.mpNumFormatter = pDocument->GetFormatTable();
++
SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
if ( pDocSh )
bIsLoading = pDocSh->IsLoading();
diff --cc sc/source/core/data/documen5.cxx
index f483a29,3d35af6..d64a80f
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@@ -461,9 -460,12 +461,17 @@@ void ScDocument::UpdateChart( const Str
}
// After the update, chart keeps track of its own data source ranges,
+ // the listener doesn't need to listen anymore, except the chart has
+ // an internal data provider.
+ if ( !( xChartDoc.is() && xChartDoc->hasInternalDataProvider() ) && pChartListenerCollection )
+ {
+ pChartListenerCollection->ChangeListening( rChartName, new ScRangeList );
+ }
++
++ // After the update, chart keeps track of its own data source ranges,
+ // the listener doesn't need to listen anymore.
+ if(pChartListenerCollection)
+ pChartListenerCollection->ChangeListening( rChartName, new ScRangeList );
}
void ScDocument::RestoreChartListener( const String& rName )
diff --cc sc/source/core/data/dpglobal.cxx
index 5dafe80,5d3717d..f932948
mode 100644,100755..100644
--- a/sc/source/core/data/dpglobal.cxx
+++ b/sc/source/core/data/dpglobal.cxx
@@@ -45,13 -45,62 +45,12 @@@ namespace ScDPGloba
rcResult.Right() = rcResult.Left() + static_cast<long>( rcResult.GetWidth() * rRight.first);
return rcResult;
}
--
- String GetFuncString( const String &rString, const USHORT nIndex )
- {
- if ( nIndex <= 1 ) return rString;
- ULONG uch = rString.Len() ? rString.GetChar( rString.Len()-1 ) : (L'9'+1);
- bool bEndWithDigital = ( L'0'<=uch && uch<=L'9');
- char szTemp[__MAX_NUM_LEN+1];
- int nLen = sprintf( szTemp, bEndWithDigital ? DATA_RENAME_SEPARATOR"%hu" : "%hu", nIndex );
- String strRet = rString;
- strRet.Append( String::CreateFromAscii( szTemp, static_cast<USHORT>(nLen) ));
- return strRet;
- }
-
- bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip /*= FALSE*/ )
- {
- if ( ScDPCollection* pDPCollection = pDestDoc->GetDPCollection() )
- {
- USHORT nCount = pDPCollection->GetCount();
- SCsCOL nOffsetX = nStartCol - nClipStartCol;
- SCsROW nOffsetY = nStartRow - nClipStartRow;
-
- for( std::list<ScDPObject>::iterator iter = rClipboard.begin(); iter!=rClipboard.end(); iter++ )
- {
- ScRange aRange = iter->GetOutRange();
-
- for( USHORT nCurrTab = nStartTab; nCurrTab<=nEndTab; nCurrTab++ )
- {
- SCsTAB nOffsetZ = nCurrTab - aRange.aStart.Tab();
- aRange.Move( nOffsetX, nOffsetY, nOffsetZ );
-
- for ( USHORT i = 0; i<nCount; i++)
- {
- if ( (*pDPCollection)[i] && aRange.Intersects( (*pDPCollection)[i]->GetOutRange()))
- {
- if ( bExcludeClip && iter->GetOutRange() == (*pDPCollection)[i]->GetOutRange() )
- {
- continue;
- }
- return false;
- }
- }
- }
- }
- }
- return true;
-}
-//end
-
}
-// --------------------------------------------------------------------
-// ScDPItemDataPool
-// Construct
-ScDPItemDataPool::ScDPItemDataPool(void)
+
+ScDPItemDataPool::ScDPItemDataPool()
{
}
-//
+
ScDPItemDataPool::ScDPItemDataPool(const ScDPItemDataPool& r):
maItems(r.maItems),
maItemIds(r.maItemIds)
diff --cc sc/source/core/data/dpgroup.cxx
index 6ad127f,c031294..9e7c68b
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@@ -809,8 -809,9 +809,6 @@@ const std::vector< SCROW >& ScDPGroupD
return maMemberEntries;
}
--
--
-
const ScDPGroupItem* ScDPGroupDimension::GetGroupForData( const ScDPItemData& rData ) const
{
for ( ScDPGroupItemVec::const_iterator aIter(aItems.begin()); aIter != aItems.end(); aIter++ )
@@@ -1388,8 -1389,9 +1386,8 @@@ void ScDPGroupTableData::FillGroupValue
sal_Int32 nPartValue = lcl_GetDatePartValue(
pData->GetValue(), pDateHelper->GetDatePart(), pDoc->GetFormatTable(),
&pDateHelper->GetNumInfo() );
- ScDPItemData aItemData( pDateHelper->GetDatePart(), String(), nPartValue, ScDPItemData::MK_DATA|ScDPItemData::MK_VAL|ScDPItemData::MK_DATEPART );
-
- ScDPItemData aItemData( pDateHelper->GetDatePart(), String(), nPartValue, ScDPItemData::MK_DATA|ScDPItemData::MK_VAL|ScDPItemData::MK_DATEPART );
- pItemDataIndex[nDim] = GetCacheTable().GetCache()->GetAdditionalItemID( aItemData );
++ ScDPItemData aItemData( pDateHelper->GetDatePart(), String(), nPartValue, ScDPItemData::MK_DATA|ScDPItemData::MK_VAL|ScDPItemData::MK_DATEPART );
+ pItemDataIndex[nDim] = GetCacheTable().getCache()->GetAdditionalItemID( aItemData );
}
}
}
diff --cc sc/source/core/data/dpobject.cxx
index bbee292,121e2c5..638e462
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@@ -2639,7 -2634,12 +2637,12 @@@ void ScDPObject::SetCacheId( long nCach
mnCacheId = nCacheId;
}
}
+
+ const ScDPTableDataCache* ScDPObject::GetCache() const
+ {
+ return pDoc->GetDPObjectCache( GetCacheId() );
+ }
-// End Comments
+
void ScDPCollection::FreeTable(ScDPObject* pDPObj)
{
const ScRange& rOutRange = pDPObj->GetOutRange();
diff --cc sc/source/core/data/dpshttab.cxx
index dae4266,b2c822a..dae4266
mode 100644,100755..100755
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
diff --cc sc/source/core/data/dptabdat.cxx
index ddcbb31,d8189d7..40bf96f
mode 100644,100755..100755
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@@ -246,12 -246,12 +246,11 @@@ void ScDPTableData::GetItemData(const S
}
nDim = GetSourceDim( nDim );
- if ( nDim >= rCacheTable.GetCache()->GetColumnCount() )
+ if ( nDim >= rCacheTable.getCache()->GetColumnCount() )
continue;
- SCROW nId= rCacheTable.GetCache()->GetItemDataId( static_cast<SCCOL>(nDim), static_cast<SCROW>(nRow), IsRepeatIfEmpty());
+ SCROW nId= rCacheTable.getCache()->GetItemDataId( static_cast<SCCOL>(nDim), static_cast<SCROW>(nRow), IsRepeatIfEmpty());
rItemData.push_back( nId );
--
}
}
@@@ -281,14 -281,14 +280,13 @@@ const ScDPItemData* ScDPTableData::GetM
const ScDPItemData* ScDPTableData::GetMemberById( long nDim, long nId)
{
--
- return GetCacheTable().GetCache()->GetItemDataById( (SCCOL) nDim, (SCROW)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 );
- }
- return GetCacheTable().GetCache()->GetIdByItemData((SCCOL) nDim, rData );
- }
++ return GetCacheTable().getCache()->GetIdByItemData((SCCOL) nDim, rData );
++}
const std::vector< SCROW >& ScDPTableData::GetColumnEntries( long nColumn )
{
@@@ -298,10 -298,10 +296,9 @@@
long ScDPTableData::GetSourceDim( long nDim )
{
return nDim;
--
}
-- long ScDPTableData::Compare( long nDim, long nDataId1, long nDataId2)
++long ScDPTableData::Compare( long nDim, long nDataId1, long nDataId2)
{
if ( getIsDataLayoutDimension(nDim) )
return 0;
diff --cc sc/source/core/data/dptablecache.cxx
index d87a88d,46ddf4c..417a6ce
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@@ -939,11 -997,11 +939,10 @@@ bool ScDPTableDataCache::IsDateDimensio
{
if ( nDim >= mnColumnCount )
return false;
- else if ( mpTableDataValues[nDim].size()==0 )
+ else if ( maTableDataValues[nDim].size()==0 )
return false;
else
- return mpTableDataValues[nDim][0]->IsDate();
-
+ return maTableDataValues[nDim][0].IsDate();
-
}
SCROW ScDPTableDataCache::GetDimMemberCount( SCCOL nDim ) const
@@@ -1024,24 -1082,23 +1023,23 @@@ SCROW ScDPTableDataCache::GetOrder(lon
}
}
- DBG_ASSERT( nIndex>=0 && (size_t)nIndex < mpIndexOrder[nDim].size() , "ScDPTableDataCache::GetOrder");
- return mpIndexOrder[nDim][nIndex];
+ DBG_ASSERT( nIndex>=0 && (size_t)nIndex < maIndexOrder[nDim].size() , "ScDPTableDataCache::GetOrder");
+ return maIndexOrder[nDim][nIndex];
}
-ScDocument* ScDPTableDataCache::GetDoc() 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;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc sc/source/core/data/dptabres.cxx
index 3315574,385e938..3315574
mode 100644,100755..100755
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
diff --cc sc/source/core/data/global.cxx
index 9b00b3f,6ca1f9c..5583bde
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@@ -1089,14 -1089,825 +1089,9 @@@ void ScGlobal::AddLanguage( SfxItemSet
}
}
--
- //--------------------------------------------------------------------
--
--
--
-//===================================================================
-// class ScFunctionList:
-//===================================================================
-
-//===================================================================
-// class ScFuncRes
-// fuer temporaere Objekte zum Holen der Resourcen
-
-class ScFuncRes : public Resource
-{
-public:
- ScFuncRes( ResId&, ScFuncDesc*, bool & rbSuppressed );
-
-private:
- USHORT GetNum();
-};
-
-//--------------------------------------------------------------------
-
-ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
- : Resource(aRes)
-{
- rbSuppressed = (bool)GetNum();
- pDesc->nCategory = GetNum();
- pDesc->sHelpId = ReadByteStringRes(); //! Hack, see scfuncs.src
- pDesc->nArgCount = GetNum();
- USHORT nArgs = pDesc->nArgCount;
- if (nArgs >= VAR_ARGS)
- nArgs -= VAR_ARGS - 1;
- if (nArgs)
- {
- pDesc->pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgs];
- for (USHORT i = 0; i < nArgs; i++)
- {
- pDesc->pDefArgFlags[i].bOptional = (bool)GetNum();
- }
- }
- // Need to read the value from the resource even if nArgs==0 to advance the
- // resource position pointer, so this can't be in the if(nArgs) block above.
- USHORT nSuppressed = GetNum();
- if (nSuppressed)
- {
- if (nSuppressed > nArgs)
- {
- DBG_ERROR3( "ScFuncRes: suppressed parameters count mismatch on OpCode %u: suppressed %d > params %d",
- aRes.GetId(), (int)nSuppressed, (int)nArgs);
- nSuppressed = nArgs; // sanitize
- }
- for (USHORT i=0; i < nSuppressed; ++i)
- {
- USHORT nParam = GetNum();
- if (nParam < nArgs)
- {
- if (pDesc->nArgCount >= VAR_ARGS && nParam == nArgs-1)
- {
- DBG_ERROR3( "ScFuncRes: VAR_ARGS parameters can't be suppressed, on OpCode %u: param %d == arg %d-1",
- aRes.GetId(), (int)nParam, (int)nArgs);
- }
- else
- {
- pDesc->pDefArgFlags[nParam].bSuppress = true;
- pDesc->bHasSuppressedArgs = true;
- }
- }
- else
- {
- DBG_ERROR3( "ScFuncRes: suppressed parameter exceeds count on OpCode %u: param %d >= args %d",
- aRes.GetId(), (int)nParam, (int)nArgs);
- }
- }
- }
-
- pDesc->pFuncName = new String( ScCompiler::GetNativeSymbol( static_cast<OpCode>( aRes.GetId())));
- pDesc->pFuncDesc = new String(ScResId(1));
-
- if (nArgs)
- {
- pDesc->ppDefArgNames = new String*[nArgs];
- pDesc->ppDefArgDescs = new String*[nArgs];
- for (USHORT i = 0; i < nArgs; i++)
- {
- pDesc->ppDefArgNames[i] = new String(ScResId(2*(i+1) ));
- pDesc->ppDefArgDescs[i] = new String(ScResId(2*(i+1)+1));
- }
- }
-
- FreeResource();
-}
-
-//------------------------------------------------------------------------
-
-USHORT ScFuncRes::GetNum()
-{
- return ReadShortRes();
-}
-
-//=========================================================================
-
-// um an die protected von Resource ranzukommen
-class ScResourcePublisher : public Resource
-{
-private:
- void FreeResource() { Resource::FreeResource(); }
-public:
- ScResourcePublisher( const ScResId& rId ) : Resource( rId ) {}
- ~ScResourcePublisher() { FreeResource(); }
- BOOL IsAvailableRes( const ResId& rId ) const
- { return Resource::IsAvailableRes( rId ); }
-
-};
-
-
-ScFunctionList::ScFunctionList() :
- nMaxFuncNameLen ( 0 )
-{
- ScFuncDesc* pDesc = NULL;
- xub_StrLen nStrLen = 0;
- FuncCollection* pFuncColl;
- USHORT i,j;
- USHORT nDescBlock[] =
- {
- RID_SC_FUNCTION_DESCRIPTIONS1,
- RID_SC_FUNCTION_DESCRIPTIONS2
- };
- const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT);
-
- aFunctionList.Clear();
-
- for ( USHORT k = 0; k < nBlocks; k++ )
- {
- ::std::auto_ptr<ScResourcePublisher> pBlock( new ScResourcePublisher( ScResId( nDescBlock[k] ) ) );
- // Browse for all possible OpCodes. This is not the fastest method, but
- // otherwise the sub resources within the resource blocks and the
- // resource blocks themselfs would had to be ordered according to
- // OpCodes, which is utopian..
- for (i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; i++)
- {
- ScResId aRes(i);
- aRes.SetRT(RSC_RESOURCE);
- // Sub resource of OpCode available?
- if (pBlock->IsAvailableRes(aRes))
- {
- pDesc = new ScFuncDesc;
- bool bSuppressed = false;
- ScFuncRes aSubRes( aRes, pDesc, bSuppressed);
- // Instead of dealing with this exceptional case at 1001 places
- // we simply don't add an entirely suppressed function to the
- // list and delete it.
- if (bSuppressed)
- delete pDesc;
- else
- {
- pDesc->nFIndex = i;
- aFunctionList.Insert( pDesc, LIST_APPEND );
-
- nStrLen = (*(pDesc->pFuncName)).Len();
- if (nStrLen > nMaxFuncNameLen)
- nMaxFuncNameLen = nStrLen;
- }
- }
- }
- }
-
- USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions
-
- // Auswertung AddIn-Liste
- String aDefArgNameValue(RTL_CONSTASCII_STRINGPARAM("value"));
- String aDefArgNameString(RTL_CONSTASCII_STRINGPARAM("string"));
- String aDefArgNameValues(RTL_CONSTASCII_STRINGPARAM("values"));
- String aDefArgNameStrings(RTL_CONSTASCII_STRINGPARAM("strings"));
- String aDefArgNameCells(RTL_CONSTASCII_STRINGPARAM("cells"));
- String aDefArgNameNone(RTL_CONSTASCII_STRINGPARAM("none"));
- String aDefArgDescValue(RTL_CONSTASCII_STRINGPARAM("a value"));
- String aDefArgDescString(RTL_CONSTASCII_STRINGPARAM("a string"));
- String aDefArgDescValues(RTL_CONSTASCII_STRINGPARAM("array of values"));
- String aDefArgDescStrings(RTL_CONSTASCII_STRINGPARAM("array of strings"));
- String aDefArgDescCells(RTL_CONSTASCII_STRINGPARAM("range of cells"));
- String aDefArgDescNone(RTL_CONSTASCII_STRINGPARAM("none"));
- String aArgName, aArgDesc;
- pFuncColl = ScGlobal::GetFuncCollection();
- for (i = 0; i < pFuncColl->GetCount(); i++)
- {
- pDesc = new ScFuncDesc;
- FuncData *pAddInFuncData = (FuncData*)pFuncColl->At(i);
- USHORT nArgs = pAddInFuncData->GetParamCount() - 1;
- pAddInFuncData->GetParamDesc( aArgName, aArgDesc, 0 );
- pDesc->nFIndex = nNextId++; // ??? OpCode vergeben
- pDesc->nCategory = ID_FUNCTION_GRP_ADDINS;
- pDesc->pFuncName = new String(pAddInFuncData->GetInternalName());
- pDesc->pFuncName->ToUpperAscii();
- pDesc->pFuncDesc = new String( aArgDesc );
- *(pDesc->pFuncDesc) += '\n';
- pDesc->pFuncDesc->AppendAscii(RTL_CONSTASCII_STRINGPARAM( "( AddIn: " ));
- *(pDesc->pFuncDesc) += pAddInFuncData->GetModuleName();
- pDesc->pFuncDesc->AppendAscii(RTL_CONSTASCII_STRINGPARAM( " )" ));
- pDesc->nArgCount = nArgs;
- if (nArgs)
- {
- pDesc->pDefArgFlags = new ScFuncDesc::ParameterFlags[nArgs];
- pDesc->ppDefArgNames = new String*[nArgs];
- pDesc->ppDefArgDescs = new String*[nArgs];
- for (j = 0; j < nArgs; j++)
- {
- pDesc->pDefArgFlags[j].bOptional = false;
- pDesc->pDefArgFlags[j].bSuppress = false;
- pAddInFuncData->GetParamDesc( aArgName, aArgDesc, j+1 );
- if ( aArgName.Len() )
- pDesc->ppDefArgNames[j] = new String( aArgName );
- else
- {
- switch (pAddInFuncData->GetParamType(j+1))
- {
- case PTR_DOUBLE:
- pDesc->ppDefArgNames[j] = new String( aDefArgNameValue );
- break;
- case PTR_STRING:
- pDesc->ppDefArgNames[j] = new String( aDefArgNameString );
- break;
- case PTR_DOUBLE_ARR:
- pDesc->ppDefArgNames[j] = new String( aDefArgNameValues );
- break;
- case PTR_STRING_ARR:
- pDesc->ppDefArgNames[j] = new String( aDefArgNameStrings );
- break;
- case PTR_CELL_ARR:
- pDesc->ppDefArgNames[j] = new String( aDefArgNameCells );
- break;
- default:
- pDesc->ppDefArgNames[j] = new String( aDefArgNameNone );
- break;
- }
- }
- if ( aArgDesc.Len() )
- pDesc->ppDefArgDescs[j] = new String( aArgDesc );
- else
- {
- switch (pAddInFuncData->GetParamType(j+1))
- {
- case PTR_DOUBLE:
- pDesc->ppDefArgDescs[j] = new String( aDefArgDescValue );
- break;
- case PTR_STRING:
- pDesc->ppDefArgDescs[j] = new String( aDefArgDescString );
- break;
- case PTR_DOUBLE_ARR:
- pDesc->ppDefArgDescs[j] = new String( aDefArgDescValues );
- break;
- case PTR_STRING_ARR:
- pDesc->ppDefArgDescs[j] = new String( aDefArgDescStrings );
- break;
- case PTR_CELL_ARR:
- pDesc->ppDefArgDescs[j] = new String( aDefArgDescCells );
- break;
- default:
- pDesc->ppDefArgDescs[j] = new String( aDefArgDescNone );
- break;
- }
- }
- }
- }
-// pDesc->nHelpId = 0;
-
- aFunctionList.Insert(pDesc, LIST_APPEND);
- nStrLen = (*(pDesc->pFuncName)).Len();
- if ( nStrLen > nMaxFuncNameLen)
- nMaxFuncNameLen = nStrLen;
- }
-
- // StarOne AddIns
-
- ScUnoAddInCollection* pUnoAddIns = ScGlobal::GetAddInCollection();
- long nUnoCount = pUnoAddIns->GetFuncCount();
- for (long nFunc=0; nFunc<nUnoCount; nFunc++)
- {
- pDesc = new ScFuncDesc;
- pDesc->nFIndex = nNextId++;
-
- if ( pUnoAddIns->FillFunctionDesc( nFunc, *pDesc ) )
- {
- aFunctionList.Insert(pDesc, LIST_APPEND);
- nStrLen = (*(pDesc->pFuncName)).Len();
- if (nStrLen > nMaxFuncNameLen)
- nMaxFuncNameLen = nStrLen;
- }
- else
- delete pDesc;
- }
-}
-
-//------------------------------------------------------------------------
-
-ScFunctionList::~ScFunctionList()
-{
- const ScFuncDesc* pDesc = First();
- while (pDesc)
- {
- delete pDesc;
- pDesc = Next();
- }
-}
-
-
-//========================================================================
-// class ScFuncDesc:
-
-ScFuncDesc::ScFuncDesc() :
- pFuncName (NULL),
- pFuncDesc (NULL),
- ppDefArgNames (NULL),
- ppDefArgDescs (NULL),
- pDefArgFlags (NULL),
- nFIndex (0),
- nCategory (0),
- nArgCount (0),
- bIncomplete (false),
- bHasSuppressedArgs(false)
-{}
-
-//------------------------------------------------------------------------
-
-ScFuncDesc::~ScFuncDesc()
-{
- Clear();
-}
-
-//------------------------------------------------------------------------
-
-void ScFuncDesc::Clear()
-{
- USHORT nArgs = nArgCount;
- if (nArgs >= VAR_ARGS) nArgs -= VAR_ARGS-1;
- if (nArgs)
- {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list