summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-10-01 07:35:04 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-10-01 07:35:04 +0000
commit70346a32723a3f3c1cbfedd2c6096152260ef9f7 (patch)
treecdadef43a660b956867d0d9a0562160ec3069429
parentff916ccce1527b63aad17bbae0ad02a834cd31d6 (diff)
CWS-TOOLING: integrate CWS chart30
-rw-r--r--chart2/MANIFEST160
-rw-r--r--chart2/NOTES129
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.cxx24
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx88
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx24
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx24
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx95
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx20
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx7
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx18
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx33
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx159
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx52
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx154
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx115
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx170
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx57
-rw-r--r--chart2/source/controller/chartapiwrapper/makefile.mk7
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx64
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx12
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx44
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.hxx21
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx33
-rw-r--r--chart2/source/controller/dialogs/DialogModel.hxx12
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionHelper.cxx106
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx7
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTrendline.cxx7
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx16
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.cxx6
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.hxx3
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx17
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx27
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx5
-rw-r--r--chart2/source/controller/dialogs/tp_Location.cxx5
-rw-r--r--chart2/source/controller/dialogs/tp_Location.hxx5
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/inc/GraphicPropertyItemConverter.hxx7
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx13
-rwxr-xr-xchart2/source/controller/inc/RangeSelectionHelper.hxx5
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx3
-rw-r--r--chart2/source/controller/inc/dlg_InsertTrendline.hxx3
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx6
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx176
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx7
-rw-r--r--chart2/source/controller/main/ChartController.cxx6
-rw-r--r--chart2/source/controller/main/ChartController.hxx4
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx3
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx56
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx34
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx12
-rw-r--r--chart2/source/inc/CachedDataSequence.hxx40
-rw-r--r--chart2/source/inc/ChartDebugTrace.hxx4
-rw-r--r--chart2/source/inc/CommonConverters.hxx59
-rw-r--r--chart2/source/inc/ContextHelper.hxx68
-rw-r--r--chart2/source/inc/DataSeriesHelper.hxx7
-rw-r--r--chart2/source/inc/DataSource.hxx13
-rw-r--r--chart2/source/inc/DataSourceHelper.hxx9
-rw-r--r--chart2/source/inc/DiagramHelper.hxx16
-rw-r--r--chart2/source/inc/FastPropertyIdRanges.hxx6
-rw-r--r--chart2/source/inc/LabeledDataSequence.hxx4
-rw-r--r--chart2/source/inc/MediaDescriptorHelper.hxx4
-rw-r--r--chart2/source/inc/ModifyListenerHelper.hxx32
-rw-r--r--chart2/source/inc/OEnumeration.hxx66
-rw-r--r--chart2/source/inc/OIndexContainer.hxx110
-rw-r--r--chart2/source/inc/OStyle.hxx116
-rw-r--r--chart2/source/inc/ObjectIdentifier.hxx10
-rw-r--r--chart2/source/inc/ReferenceSizeProvider.hxx21
-rw-r--r--chart2/source/inc/RegressionCurveHelper.hxx7
-rw-r--r--chart2/source/inc/WeakListenerAdapter.hxx6
-rw-r--r--chart2/source/inc/macros.hxx4
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx3
-rw-r--r--chart2/source/model/main/Axis.cxx4
-rw-r--r--chart2/source/model/main/ChartModel.cxx144
-rw-r--r--chart2/source/model/main/ChartModel.hxx80
-rw-r--r--chart2/source/model/main/DataPoint.cxx8
-rw-r--r--chart2/source/model/main/DataPoint.hxx3
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx4
-rw-r--r--chart2/source/model/main/DataPointStyle.cxx174
-rw-r--r--chart2/source/model/main/DataPointStyle.hxx83
-rw-r--r--chart2/source/model/main/DataSeriesStyle.cxx177
-rw-r--r--chart2/source/model/main/DataSeriesStyle.hxx83
-rw-r--r--chart2/source/model/main/Diagram.cxx3
-rw-r--r--chart2/source/model/main/FormattedString.cxx8
-rw-r--r--chart2/source/model/main/FormattedString.hxx3
-rw-r--r--chart2/source/model/main/ImplChartModel.cxx148
-rw-r--r--chart2/source/model/main/ImplChartModel.hxx11
-rw-r--r--chart2/source/model/main/Style.cxx161
-rw-r--r--chart2/source/model/main/Style.hxx116
-rw-r--r--chart2/source/model/main/StyleFamilies.cxx179
-rw-r--r--chart2/source/model/main/StyleFamilies.hxx103
-rw-r--r--chart2/source/model/main/StyleFamily.cxx267
-rw-r--r--chart2/source/model/main/StyleFamily.hxx115
-rw-r--r--chart2/source/model/main/makefile.mk6
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx4
-rw-r--r--chart2/source/tools/AxisHelper.cxx4
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx68
-rw-r--r--chart2/source/tools/ChartDebugTrace.cxx5
-rw-r--r--chart2/source/tools/CommonConverters.cxx189
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx9
-rw-r--r--chart2/source/tools/ContextHelper.cxx64
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx13
-rw-r--r--chart2/source/tools/DataSource.cxx28
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx58
-rw-r--r--chart2/source/tools/DiagramHelper.cxx88
-rw-r--r--chart2/source/tools/ImplUndoManager.cxx7
-rw-r--r--chart2/source/tools/ImplUndoManager.hxx3
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx7
-rw-r--r--chart2/source/tools/MediaDescriptorHelper.cxx23
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx53
-rw-r--r--chart2/source/tools/OEnumeration.cxx67
-rw-r--r--chart2/source/tools/OIndexContainer.cxx183
-rw-r--r--chart2/source/tools/OStyle.cxx233
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx36
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx21
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx44
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx8
-rw-r--r--chart2/source/tools/TitleHelper.cxx52
-rw-r--r--chart2/source/tools/WeakListenerAdapter.cxx12
-rw-r--r--chart2/source/tools/makefile.mk6
-rw-r--r--chart2/source/view/axes/ScaleAutomatism.cxx7
-rw-r--r--chart2/source/view/axes/TickmarkHelper.cxx21
-rw-r--r--chart2/source/view/axes/TickmarkHelper.hxx5
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx19
-rw-r--r--chart2/source/view/axes/VPolarGrid.cxx5
-rw-r--r--chart2/source/view/axes/VPolarGrid.hxx4
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx12
-rw-r--r--chart2/source/view/charttypes/CategoryPositionHelper.cxx10
-rw-r--r--chart2/source/view/charttypes/CategoryPositionHelper.hxx3
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx9
-rw-r--r--chart2/source/view/charttypes/PieChart.hxx3
-rw-r--r--chart2/source/view/charttypes/Splines.cxx115
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx19
-rw-r--r--chart2/source/view/inc/LabelPositionHelper.hxx4
-rw-r--r--chart2/source/view/inc/ScaleAutomatism.hxx4
-rw-r--r--chart2/source/view/inc/ShapeFactory.hxx10
-rw-r--r--chart2/source/view/inc/Stripe.hxx4
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx4
-rw-r--r--chart2/source/view/inc/VDataSeries.hxx4
-rw-r--r--chart2/source/view/inc/VLegendSymbolFactory.hxx25
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx5
-rw-r--r--chart2/source/view/main/ChartItemPool.cxx9
-rw-r--r--chart2/source/view/main/ChartItemPool.hxx6
-rw-r--r--chart2/source/view/main/ChartView.cxx138
-rw-r--r--chart2/source/view/main/LabelPositionHelper.cxx20
-rw-r--r--chart2/source/view/main/Linear3DTransformation.cxx7
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx129
-rw-r--r--chart2/source/view/main/Stripe.cxx7
-rw-r--r--chart2/source/view/main/VDataSeries.cxx6
-rw-r--r--chart2/source/view/main/VLegendSymbolFactory.cxx147
-rw-r--r--chart2/workbench/addin/sampleaddin.cxx18
-rw-r--r--chart2/workbench/anyperformance/anyperformance.cxx193
-rw-r--r--chart2/workbench/anyperformance/makefile.mk140
-rw-r--r--chart2/workbench/fileformat/chart.mod237
-rw-r--r--chart2/workbench/fileformat/chart2.mod187
-rw-r--r--chart2/workbench/fileformat/content.xml97
-rw-r--r--chart2/workbench/fileformat/datastyl.mod175
-rw-r--r--chart2/workbench/fileformat/drawing.mod857
-rw-r--r--chart2/workbench/fileformat/dtypes.mod147
-rw-r--r--chart2/workbench/fileformat/form.mod312
-rw-r--r--chart2/workbench/fileformat/meta.mod94
-rw-r--r--chart2/workbench/fileformat/newchart.xml_hints77
-rw-r--r--chart2/workbench/fileformat/newchart_test.xml55
-rw-r--r--chart2/workbench/fileformat/nmspace.mod55
-rw-r--r--chart2/workbench/fileformat/office.dtd59
-rw-r--r--chart2/workbench/fileformat/office.mod231
-rw-r--r--chart2/workbench/fileformat/script.mod55
-rw-r--r--chart2/workbench/fileformat/settings.mod53
-rw-r--r--chart2/workbench/fileformat/style.mod412
-rw-r--r--chart2/workbench/fileformat/table.mod497
-rw-r--r--chart2/workbench/fileformat/text.mod891
-rw-r--r--chart2/workbench/fileformat/xmlSpyProject.spp13
-rw-r--r--chart2/workbench/officeintegration/install.pl146
-rw-r--r--chart2/workbench/sampledata/12series.chd18
-rw-r--r--chart2/workbench/sampledata/29series.chd35
-rw-r--r--chart2/workbench/sampledata/big.chd14
-rw-r--r--chart2/workbench/sampledata/circle.chd13
-rw-r--r--chart2/workbench/sampledata/data.chd35
-rw-r--r--chart2/workbench/sampledata/default.chd14
-rw-r--r--chart2/workbench/sampledata/manyseries.chd1006
-rw-r--r--chart2/workbench/sampledata/numbers.chd22
-rw-r--r--chart2/workbench/sampledata/pie.chd17
-rw-r--r--chart2/workbench/sampledata/regtest.chd26
-rw-r--r--chart2/workbench/sampledata/stock.chd20
-rw-r--r--chart2/workbench/stub/newCHxx.cxx45
-rw-r--r--chart2/workbench/stub/newCHxx.hxx51
-rw-r--r--chart2/workbench/stub/newUNOcomponent.cxx78
-rw-r--r--chart2/workbench/stub/newUNOcomponent.hxx58
-rw-r--r--chart2/workbench/stub/xserviceinfo.cxx135
202 files changed, 917 insertions, 12328 deletions
diff --git a/chart2/MANIFEST b/chart2/MANIFEST
index d347879a3e32..e69de29bb2d1 100644
--- a/chart2/MANIFEST
+++ b/chart2/MANIFEST
@@ -1,160 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: MANIFEST,v $
-#
-# $Revision: 1.5 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-Directory Structure
--------------------
-
-+--inc
-+--prj
-+--res
-+--source
-| +--controller
-| | +---dialogs
-| | +---drawinglayer
-| | +---itemsetwrapper
-| | +---main
-| | +---menu
-| +--inc
-| +--model
-| | +---inc
-| | +---main
-| | +---oldapi
-| | +---template
-| | +---tree
-| +--tools
-| +--view
-| | +---axes
-| | +---charttypes
-| | +---diagram
-| | +---inc
-| | +---main
-+--qa
-+--util
-+--workbench
- +--anyperformance
- +--fileformat
- +--officeintegration
- +--prj
- +--sampledata
- +--stub
-
-
-makefile.mk
------------
-
-The top-level makefile is for generating a jar-file containing all compiled
-java-files that were generated from the chart-idl files. The jar is necessary
-for test-programs (see qa subdirectory)
-
-prj
----
-
-Contains the build.lst, which determines in which order the subdirectories have
-to be built.
-
-Also contains the d.lst which tells the deliver command which files to export
-into the output tree, so that other modules have access. These are currently
-only C++-headers of project-specific UNO-classes.
-
-source
-------
-
- inc
- ---
-
- Contains header files that have to be shared between files of model, view and
- controller. Apart from tools-headers, this should only include headers for
- model objects, not view objects.
-
- controller
- ----------
-
- Contains files concerning the controller. All dialogs used in the UI of the
- component are in the dialogs subfolder. In drawinglayer, there is code that
- builds the bridge to the drawing-layer via non-UNO code. Itemsetwrapper
- offers classes that convert XPropertySets of chart objects into non-UNO
- SfxItemSets that are used to feed dialogs.
-
- model
- -----
-
- Contains files concerning the model. In oldapi there is code that implements
- the old UNO-API (com.sun.star.chart.*) and wraps the new objects, thus it is
- possible to talk to the new objects via the old API. Until the XML-filter is
- adapted to the new API it will use this wrapper to communicate via the old
- API.
-
- In the tree-subfolder, there are all classes that have to do with the
- data-series tree provided by the XDiagram. Template contains code that
- provides templates for all different chart-types.
-
- view
- ----
-
- Axes, charttypes and diagram implement the respective view-objects.
-
-util
-----
-
-Contains the makefile to assemble the idl files into an rdb, and to generate C++
-headers for them.
-
-workbench
----------
-
-Contains files for testing and files needed during prototyping.
-
- officeintegration
- -----------------
-
- Contains the install.pl script that installs the chart once it is build into
- an existing office installation. This should become deprecated soon, when
- the new chart will be a package.
-
-
- sampledata
- ----------
-
- Contains sample files of data to feed a chart with. The files are loaded via
- the FileDataSource and is thought for testing only.
-
- stub
- ----
-
- Contains some templates for newly created files.
-
-qa
---
-
-Contains java-programs that execute so-called complex-testcases. Type dmake in
-this directory to build the tests (they are not automatically built) and then
-type dmake runtest to execute all tests. For most tests you will have to have a
-running office in the background that listens to requests on port 8100.
diff --git a/chart2/NOTES b/chart2/NOTES
index 40283baa73b4..e69de29bb2d1 100644
--- a/chart2/NOTES
+++ b/chart2/NOTES
@@ -1,129 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: NOTES,v $
-#
-# $Revision: 1.6 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-NOTES
-=====
-
-Activate the New Chart
-----------------------
-
-After installation of an Office, you will still get the old chart
-implementation. In order to get the new implementation you have to activate it
-via the configuration.
-
-Set the boolean Config-Item Office.Common/Internal:DevelopmentChart to true.
-
-HOW-TO:
-
-* Open the file Common.xcu of the Registry.
-
-Location on Unix:
-$HOME/StarOffice8/user/registry/data/org/openoffice/Office/Common.xcu
-
-Location on Windows:
-"%UserProfile%\Application Data\StarOffice8\user\registry\data\org\openoffice\Office\Common.xcu"
-
-* Under the configuration-node "Internal" (see <node oor:name="Internal"> tag)
- you have to add the property "DevelopmentChart" and set this to "true":
-
-* Add the following after the "Internal"-node:
-
- <prop oor:name="DevelopmentChart" oor:type="xs:boolean">
- <value>true</value>
- </prop>
-
-After that, your Common.xcu may look like this:
-
-,----[ Common.xcu example ]
-| <?xml version="1.0" encoding="UTF-8"?>
-| <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office">
-| <node oor:name="Internal">
-| <prop oor:name="DevelopmentChart" oor:type="xs:boolean">
-| <value>true</value>
-| </prop>
-| <prop oor:name="CurrentTempURL" oor:type="xs:string">
-| <value/>
-| </prop>
-| </node>
-| <node oor:name="Help">
-| <node oor:name="Registration">
-| <prop oor:name="ReminderDate" oor:type="xs:string">
-| <value xsi:nil="true"/>
-| </prop>
-| <prop oor:name="RequestDialog" oor:type="xs:int">
-| <value>0</value>
-| </prop>
-| </node>
-| </node>
-| <node oor:name="Misc">
-| <prop oor:name="FirstRun" oor:type="xs:boolean">
-| <value>false</value>
-| </prop>
-| </node>
-| </oor:component-data>
-`----
-
-* To switch back, you can either replace the "true" by a "false", or you can
- delete the complete "DevelopmentChart" property (the three lines) you
- inserted.
-
-FileDataSource
---------------
-
-For testing the FileDataSource: Currently the following files are read (hard-coded)
-* Win: D:\files\data.chd
-* Unix: /work/data/data.chd
-
-You can find sample data in workbench/sampledata
-
-Testing
--------
-
-* To create a chart using the abovementioned file for data, Call the menu item
- 'File/Save all'. To rebuild the chart call 'File/Save'.
-
-* You can also create a chart from spreadsheet data.
-
-* To run a test for the old API run "dmake" in the qa subdirectory. Note that
- you have to deliver the private chart2.rdb (just type "deliver") and call the
- workbench/officeintegration/install.pl script for registering the private
- Chart API at the global registry in order to run the test. Currently the test
- has to use new API, but in the future this will of course no longer be
- necessary.
-
- For running the API-test you must have a running office with the correct
- parameters that allow remote access from external components (like the API
- test). Use the following command-line argument:
-
- "-accept=socket,host=0,port=8100;urp"
-
- With host=0 you allow access only from your local machine, so this should be
- no network security problem.
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 888cc4477548..de6a2ed33838 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AreaWrapper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -42,8 +42,6 @@
#include "LineProperties.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
-// #include "NamedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
#include <algorithm>
@@ -189,8 +187,6 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U("LineStyle"), C2U("LineStyle") ) );
-// WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
-
return aWrappedProperties;
}
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 350d51b2bfa6..96eb55f5f369 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AxisWrapper.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.8.3 $
*
* This file is part of OpenOffice.org.
*
@@ -43,15 +43,14 @@
#include "CharacterProperties.hxx"
#include "LineProperties.hxx"
-// #include "NamedLineProperties.hxx"
#include "UserDefinedProperties.hxx"
#include "WrappedCharacterHeightProperty.hxx"
#include "WrappedTextRotationProperty.hxx"
-// #include "WrappedNamedProperty.hxx"
#include "WrappedGapwidthProperty.hxx"
#include "WrappedScaleProperty.hxx"
#include "WrappedDefaultProperty.hxx"
#include "WrappedNumberFormatProperty.hxx"
+#include "WrappedScaleTextProperties.hxx"
#include <algorithm>
#include <rtl/ustrbuf.hxx>
@@ -306,6 +305,7 @@ const Sequence< Property > & lcl_GetPropertySequence()
::chart::LineProperties::AddPropertiesToVector( aProperties );
// ::chart::NamedLineProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+ ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
// and sort them for access via bsearch
::std::sort( aProperties.begin(), aProperties.end(),
@@ -440,26 +440,27 @@ void SAL_CALL AxisWrapper::removeEventListener(
// ================================================================================
//ReferenceSizePropertyProvider
-void AxisWrapper::setCurrentSizeAsReference()
+void AxisWrapper::updateReferenceSize()
{
- /*
Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
if( xProp.is() )
- xProp->setPropertyValue( C2U("ReferenceDiagramSize"), uno::makeAny(
- m_spChart2ModelContact->GetDiagramSize() ));
- */
+ {
+ if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+ xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+ m_spChart2ModelContact->GetPageSize() ));
+ }
}
Any AxisWrapper::getReferenceSize()
{
Any aRet;
Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
if( xProp.is() )
- aRet = xProp->getPropertyValue( C2U("ReferenceDiagramSize") );
+ aRet = xProp->getPropertyValue( C2U("ReferencePageSize") );
return aRet;
}
awt::Size AxisWrapper::getCurrentSizeForReference()
{
- return m_spChart2ModelContact->GetDiagramSize();
+ return m_spChart2ModelContact->GetPageSize();
}
// ================================================================================
@@ -534,9 +535,8 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
WrappedScaleProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
- //aWrappedProperties.push_back( new WrappedStackedTextProperty() );
-// WrappedNamedProperty::addWrappedLineProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this );
+ WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
return aWrappedProperties;
}
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 4d18df938b66..b7708dcf2ac2 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AxisWrapper.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -82,7 +82,7 @@ public:
APPHELPER_XSERVICEINFO_DECL()
//ReferenceSizePropertyProvider
- virtual void setCurrentSizeAsReference();
+ virtual void updateReferenceSize();
virtual ::com::sun::star::uno::Any getReferenceSize();
virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 609a451ec7bb..4b44b2e0593d 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Chart2ModelContact.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -178,87 +178,12 @@ sal_Int32 Chart2ModelContact::getExplicitNumberFormatKeyForAxis(
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-uno::Any Chart2ModelContact::GetListElementByName(
- const rtl::OUString& rElementName, const rtl::OUString& rTableTypePropertyName )
-{
- uno::Any aResult;
- try
- {
- tTableMap::iterator aIter( m_aTableMap.find(rTableTypePropertyName) );
- if( aIter == m_aTableMap.end() )
- {
- DBG_ERROR("no container found for the given type (gradient/hatch etc)");
- return aResult;
- }
-
- if( !aIter->second->hasByName(rElementName) )
- {
- DBG_ERROR("no element with the given name found");
- return aResult;
- }
-
- aResult = aIter->second->getByName(rElementName);
- }
- catch( uno::Exception& e)
- {
- ASSERT_EXCEPTION( e );
- }
- return aResult;
-}
-
-::rtl::OUString Chart2ModelContact::GetNameOfListElement(
- const uno::Any& rElementValue, const ::rtl::OUString& rTableTypePropertyName )
-{
- try
- {
- tTableMap::iterator aIter( m_aTableMap.find(rTableTypePropertyName) );
- if( aIter == m_aTableMap.end() )
- {
- DBG_ERROR("no container found for the given type (gradient/hatch etc)");
- return ::rtl::OUString();
- }
-
- uno::Reference< container::XNameContainer > xTable( aIter->second, uno::UNO_QUERY );
- if( xTable.is() )
- {
- uno::Sequence< rtl::OUString > aNames( xTable->getElementNames() );
- for( sal_Int32 nN = aNames.getLength(); nN--; )
- {
- if( xTable->getByName( aNames[nN] ) == rElementValue )
- {
- return aNames[nN];
- }
- }
- }
- }
- catch( uno::Exception& e)
- {
- ASSERT_EXCEPTION( e );
- }
- return ::rtl::OUString();
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
awt::Size Chart2ModelContact::GetPageSize() const
{
return ChartModelHelper::getPageSize(m_xChartModel);
}
-awt::Size Chart2ModelContact::GetDiagramSize() const
-{
- awt::Size aSize;
- ExplicitValueProvider* pProvider( getExplicitValueProvider() );
- if( pProvider )
- {
- aSize = ToSize( pProvider->getRectangleOfObject( lcl_getCIDForDiagram( m_xChartModel ) ) );
- }
- return aSize;
-}
-
awt::Rectangle Chart2ModelContact::GetDiagramRectangleInclusive() const
{
awt::Rectangle aRect;
@@ -285,17 +210,6 @@ awt::Point Chart2ModelContact::GetDiagramPositionInclusive() const
return ToPoint( this->GetDiagramRectangleInclusive() );
}
-awt::Point Chart2ModelContact::GetDiagramPosition() const
-{
- awt::Point aPoint;
- ExplicitValueProvider* pProvider( getExplicitValueProvider() );
- if( pProvider )
- {
- aPoint = ToPoint( pProvider->getRectangleOfObject( lcl_getCIDForDiagram( m_xChartModel ) ) );
- }
- return aPoint;
-}
-
awt::Size Chart2ModelContact::GetLegendSize() const
{
awt::Size aSize;
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index 82257d63b544..b8ce668dff28 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Chart2ModelContact.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -87,38 +87,16 @@ public:
sal_Int32 getExplicitNumberFormatKeyForAxis(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
- /** returns an element with name rElementName found in the list corresponding to the type PropertyName
- (e.g. if rTableTypePropertyName == "FillGradientName" and rElementName == "Gradient 3", then this method will return the corresponding gradient )
- */
- ::com::sun::star::uno::Any GetListElementByName(
- const ::rtl::OUString & rElementName, const ::rtl::OUString & rTableTypePropertyName );
-
- /** search the list corresponding to rTableTypePropertyName for an element that has the same values as rElement.
- returns the found name.
- */
- ::rtl::OUString GetNameOfListElement(
- const ::com::sun::star::uno::Any& rElementValue, const ::rtl::OUString & rTableTypePropertyName );
-
-
/** Returns the size of the page in logic coordinates. This value is used
for setting an appropriate "ReferencePageSize" for FontHeights.
*/
::com::sun::star::awt::Size GetPageSize() const;
- /** Returns the size of the diagram object in logic coordinates. This value
- is used for setting an appropriate "ReferenceDiagramSize" for FontHeights.
- */
- ::com::sun::star::awt::Size GetDiagramSize() const;
-
/** Returns the size of the diagram object in logic coordinates inclusive
the space reserved for axis titles.
*/
::com::sun::star::awt::Size GetDiagramSizeInclusive() const;
- /** Returns the position of the object in logic coordinates.
- */
- ::com::sun::star::awt::Point GetDiagramPosition() const;
-
/** Returns the position of the diagram in logic coordinates inclusive
the space reserved for axis titles.
*/
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 5b3a7a977ff1..fc62b3b77223 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSeriesPointWrapper.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.44.3 $
*
* This file is part of OpenOffice.org.
*
@@ -49,6 +49,7 @@
#include "WrappedSymbolProperties.hxx"
#include "WrappedDataCaptionProperties.hxx"
#include "WrappedSeriesAreaOrLineProperty.hxx"
+#include "WrappedScaleTextProperties.hxx"
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
// header for define DBG_ASSERT
@@ -184,6 +185,7 @@ const uno::Sequence< Property > & lcl_GetPropertySequence( DataSeriesPointWrappe
::chart::LineProperties::AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+ ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
// and sort them for access via bsearch
::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() );
@@ -582,26 +584,27 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties(
// ================================================================================
//ReferenceSizePropertyProvider
-void DataSeriesPointWrapper::setCurrentSizeAsReference()
+void DataSeriesPointWrapper::updateReferenceSize()
{
- /*
Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
if( xProp.is() )
- xProp->setPropertyValue( C2U("ReferenceDiagramSize"), uno::makeAny(
- m_spChart2ModelContact->GetDiagramSize() ));
- */
+ {
+ if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+ xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+ m_spChart2ModelContact->GetPageSize() ));
+ }
}
Any DataSeriesPointWrapper::getReferenceSize()
{
Any aRet;
Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
if( xProp.is() )
- aRet = xProp->getPropertyValue( C2U("ReferenceDiagramSize") );
+ aRet = xProp->getPropertyValue( C2U("ReferencePageSize") );
return aRet;
}
awt::Size DataSeriesPointWrapper::getCurrentSizeForReference()
{
- return m_spChart2ModelContact->GetDiagramSize();
+ return m_spChart2ModelContact->GetPageSize();
}
// ================================================================================
@@ -705,6 +708,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
WrappedSymbolProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
WrappedDataCaptionProperties::addWrappedPropertiesForSeries( aWrappedProperties, m_spChart2ModelContact );
+ WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
//add unnamed fill properties (different inner names here)
// aWrappedProperties.push_back( new WrappedUnnamedProperty( C2U( "FillGradient" ), C2U( "GradientName" ) ) );
@@ -742,10 +746,6 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapPositionOffsetX" ), C2U( "FillBitmapPositionOffsetX" ) ) );
aWrappedProperties.push_back( new WrappedProperty( C2U( "FillBitmapPositionOffsetY" ), C2U( "FillBitmapPositionOffsetY" ) ) );
- //aWrappedProperties.push_back( new WrappedNamedProperty( C2U( "FillBitmapName" ), C2U( "FillBitmap" ), m_spChart2ModelContact ) );
- //[optional, property] com::sun::star::awt::XBitmap FillBitmap;
- //[optional, property] string FillBitmapURL;
-
aWrappedProperties.push_back( new WrappedProperty( C2U( "SolidType" ), C2U( "Geometry3D" ) ) );
aWrappedProperties.push_back( new WrappedSegmentOffsetProperty() );
aWrappedProperties.push_back( new WrappedProperty( C2U( "D3DPercentDiagonal" ), C2U( "PercentDiagonal" ) ) );
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index b43c34988d44..0e3b87605b77 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSeriesPointWrapper.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -92,7 +92,7 @@ public:
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
//ReferenceSizePropertyProvider
- virtual void setCurrentSizeAsReference();
+ virtual void updateReferenceSize();
virtual ::com::sun::star::uno::Any getReferenceSize();
virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index f7a2abebb8da..c8220254d94e 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DiagramWrapper.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.17.32.3 $
*
* This file is part of OpenOffice.org.
*
@@ -61,6 +61,7 @@
#include "ModifyListenerHelper.hxx"
#include "DisposeHelper.hxx"
#include <comphelper/InlineContainer.hxx>
+#include "WrappedAutomaticPositionProperties.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
@@ -73,8 +74,6 @@
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
#include "SceneProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
-// #include "WrappedSceneProperty.hxx"
#include <map>
#include <algorithm>
@@ -150,7 +149,9 @@ enum
PROP_DIAGRAM_HAS_SECOND_Y_AXIS_DESCR,
PROP_DIAGRAM_HAS_SECOND_X_AXIS_TITLE,
- PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE
+ PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE,
+
+ PROP_DIAGRAM_AUTOMATIC_SIZE
};
void lcl_AddPropertiesToVector(
@@ -418,6 +419,13 @@ void lcl_AddPropertiesToVector(
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
+
+ rOutProperties.push_back(
+ Property( C2U( "AutomaticSize" ),
+ PROP_DIAGRAM_AUTOMATIC_SIZE,
+ ::getBooleanCppuType(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
}
const uno::Sequence< Property > & lcl_GetPropertySequence()
@@ -440,6 +448,7 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
WrappedDataCaptionProperties::addProperties( aProperties );
WrappedSplineProperties::addProperties( aProperties );
WrappedStockProperties::addProperties( aProperties );
+ WrappedAutomaticPositionProperties::addProperties( aProperties );
// and sort them for access via bsearch
::std::sort( aProperties.begin(), aProperties.end(),
@@ -1886,6 +1895,81 @@ Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPrope
//-----------------------------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------------------------
+class WrappedAutomaticSizeProperty : public WrappedProperty
+{
+public:
+ WrappedAutomaticSizeProperty();
+ virtual ~WrappedAutomaticSizeProperty();
+
+ virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
+ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
+ virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
+ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+
+ virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const
+ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+};
+
+WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
+ : WrappedProperty( C2U( "AutomaticSize" ), OUString() )
+{
+}
+
+WrappedAutomaticSizeProperty::~WrappedAutomaticSizeProperty()
+{
+}
+
+void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ if( xInnerPropertySet.is() )
+ {
+ bool bNewValue = true;
+ if( ! (rOuterValue >>= bNewValue) )
+ throw lang::IllegalArgumentException( C2U("Property AutomaticSize requires value of type boolean"), 0, 0 );
+
+ try
+ {
+ if( bNewValue )
+ {
+ Any aRelativeSize( xInnerPropertySet->getPropertyValue( C2U( "RelativeSize" ) ) );
+ if( aRelativeSize.hasValue() )
+ xInnerPropertySet->setPropertyValue( C2U( "RelativeSize" ), Any() );
+ }
+ }
+ catch( uno::Exception & ex )
+ {
+ ASSERT_EXCEPTION( ex );
+ }
+ }
+}
+
+Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
+ if( xInnerPropertySet.is() )
+ {
+ Any aRelativeSize( xInnerPropertySet->getPropertyValue( C2U( "RelativeSize" ) ) );
+ if( !aRelativeSize.hasValue() )
+ aRet <<= true;
+ }
+ return aRet;
+}
+
+Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ Any aRet;
+ aRet <<= false;
+ return aRet;
+}
+
+//-----------------------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------------------------------------------
+
// ____ XDiagramProvider ____
Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram()
throw (uno::RuntimeException)
@@ -1917,7 +2001,6 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
{
::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
- //WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedAxisAndGridExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedAxisTitleExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedAxisLabelExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
@@ -1929,6 +2012,7 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( aWrappedProperties, m_spChart2ModelContact );
WrappedSplineProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedStockProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
+ WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties );
aWrappedProperties.push_back( new WrappedDataRowSourceProperty( m_spChart2ModelContact ) );
aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED,m_spChart2ModelContact ) );
@@ -1940,6 +2024,7 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
aWrappedProperties.push_back( new WrappedAttributedDataPointsProperty( m_spChart2ModelContact ) );
aWrappedProperties.push_back( new WrappedProperty( C2U( "StackedBarsConnected" ), C2U( "ConnectBars" ) ) );
aWrappedProperties.push_back( new WrappedSolidTypeProperty( m_spChart2ModelContact ) );
+ aWrappedProperties.push_back( new WrappedAutomaticSizeProperty() );
return aWrappedProperties;
}
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 30ea7d1ecfa4..11cf4cbb3102 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: GridWrapper.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -42,9 +42,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include "LineProperties.hxx"
-// #include "NamedLineProperties.hxx"
#include "UserDefinedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
#include "WrappedDefaultProperty.hxx"
#include <algorithm>
@@ -192,7 +190,6 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
{
::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
-// WrappedNamedProperty::addWrappedLineProperties( aWrappedProperties, m_spChart2ModelContact );
aWrappedProperties.push_back( new WrappedDefaultProperty( C2U("LineColor"), C2U("LineColor"), uno::makeAny( sal_Int32( 0x000000) ) ) ); // black
return aWrappedProperties;
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 93a8b3533eab..e6b63308b01d 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: LegendWrapper.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.16.4 $
*
* This file is part of OpenOffice.org.
*
@@ -48,11 +48,11 @@
#include "LineProperties.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
-// #include "NamedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
#include "WrappedCharacterHeightProperty.hxx"
#include "PositionAndSizeHelper.hxx"
#include "WrappedDirectStateProperty.hxx"
+#include "WrappedAutomaticPositionProperties.hxx"
+#include "WrappedScaleTextProperties.hxx"
#include <algorithm>
#include <rtl/ustrbuf.hxx>
@@ -265,6 +265,8 @@ const Sequence< Property > & lcl_GetPropertySequence()
::chart::FillProperties::AddPropertiesToVector( aProperties );
// ::chart::NamedProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+ ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
+ ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
// and sort them for access via bsearch
::std::sort( aProperties.begin(), aProperties.end(),
@@ -380,12 +382,15 @@ void SAL_CALL LegendWrapper::removeEventListener(
// ================================================================================
//ReferenceSizePropertyProvider
-void LegendWrapper::setCurrentSizeAsReference()
+void LegendWrapper::updateReferenceSize()
{
Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
if( xProp.is() )
- xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
- m_spChart2ModelContact->GetPageSize() ));
+ {
+ if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+ xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+ m_spChart2ModelContact->GetPageSize() ));
+ }
}
Any LegendWrapper::getReferenceSize()
{
@@ -424,11 +429,12 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties()
::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
aWrappedProperties.push_back( new WrappedLegendAlignmentProperty() );
-// WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this );
//same problem as for wall: thje defaults ion the old chart are different for different charttypes, so we need to export explicitly
aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U("FillStyle"), C2U("FillStyle") ) );
aWrappedProperties.push_back( new WrappedDirectStateProperty( C2U("FillColor"), C2U("FillColor") ));
+ WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties );
+ WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
return aWrappedProperties;
}
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 6d92c70de4a7..85483ec6c59c 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: LegendWrapper.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -69,7 +69,7 @@ public:
APPHELPER_XSERVICEINFO_DECL()
//ReferenceSizePropertyProvider
- virtual void setCurrentSizeAsReference();
+ virtual void updateReferenceSize();
virtual ::com::sun::star::uno::Any getReferenceSize();
virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index cb5661e75d1a..f545e54f872b 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: MinMaxLineWrapper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -98,7 +98,6 @@ MinMaxLineWrapper::MinMaxLineWrapper( ::boost::shared_ptr< Chart2ModelContact >
: m_spChart2ModelContact( spChart2ModelContact )
, m_aEventListenerContainer( m_aMutex )
, m_pPropertyArrayHelper()
- //, m_aWrappedLineDashNameProperty( spChart2ModelContact )
, m_aWrappedLineJointProperty( C2U("LineJoint"), uno::makeAny( drawing::LineJoint_NONE ))
{
}
@@ -192,8 +191,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const ::rtl::OUString& rPrope
xPropSet->setPropertyValue( C2U("Transparency"), rValue );
else if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
m_aWrappedLineJointProperty.setPropertyValue( rValue, xPropSet );
- //else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
- // m_aWrappedLineDashNameProperty.setPropertyValue( rValue, xPropSet );
else
xPropSet->setPropertyValue( rPropertyName, rValue );
return;
@@ -238,8 +235,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const ::rtl::OUString& rP
aRet = xPropSet->getPropertyValue( C2U("Transparency") );
else if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
aRet = m_aWrappedLineJointProperty.getPropertyValue( xPropSet );
- //else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
- // aRet = m_aWrappedLineDashNameProperty.getPropertyValue( xPropSet );
else
aRet = xPropSet->getPropertyValue( rPropertyName );
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 04379894a69f..411c97e71a5e 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: MinMaxLineWrapper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,7 +33,6 @@
#include "ServiceMacros.hxx"
#include "MutexContainer.hxx"
#include "WrappedIgnoreProperty.hxx"
-//#include "WrappedNamedProperty.hxx"
#include <cppuhelper/interfacecontainer.hxx>
@@ -133,7 +132,6 @@ private: //member
::boost::shared_ptr< ::cppu::OPropertyArrayHelper > m_pPropertyArrayHelper;
-// WrappedLineDashNameProperty m_aWrappedLineDashNameProperty;
WrappedIgnoreProperty m_aWrappedLineJointProperty;
};
diff --git a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
index 5e5616a3b3ca..c9199bcadaff 100644
--- a/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
+++ b/chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ReferenceSizePropertyProvider.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -39,7 +39,7 @@ namespace wrapper
class ReferenceSizePropertyProvider
{
public:
- virtual void setCurrentSizeAsReference() = 0;
+ virtual void updateReferenceSize() = 0;
virtual ::com::sun::star::uno::Any getReferenceSize() = 0;
virtual ::com::sun::star::awt::Size getCurrentSizeForReference() = 0;
};
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index d715ddc661e3..e0e9511cf71d 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: TitleWrapper.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.44.4 $
*
* This file is part of OpenOffice.org.
*
@@ -41,10 +41,10 @@
#include "LineProperties.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
-// #include "NamedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
#include "WrappedCharacterHeightProperty.hxx"
#include "WrappedTextRotationProperty.hxx"
+#include "WrappedAutomaticPositionProperties.hxx"
+#include "WrappedScaleTextProperties.hxx"
#include <algorithm>
#include <rtl/ustrbuf.hxx>
@@ -199,6 +199,8 @@ const Sequence< Property > & lcl_GetPropertySequence()
::chart::FillProperties::AddPropertiesToVector( aProperties );
// ::chart::NamedProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
+ ::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
+ ::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
// and sort them for access via bsearch
::std::sort( aProperties.begin(), aProperties.end(),
@@ -455,12 +457,15 @@ Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName )
// ================================================================================
//ReferenceSizePropertyProvider
-void TitleWrapper::setCurrentSizeAsReference()
+void TitleWrapper::updateReferenceSize()
{
Reference< beans::XPropertySet > xProp( this->getTitleObject(), uno::UNO_QUERY );
if( xProp.is() )
- xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
+ {
+ if( xProp->getPropertyValue( C2U("ReferencePageSize") ).hasValue() )
+ xProp->setPropertyValue( C2U("ReferencePageSize"), uno::makeAny(
m_spChart2ModelContact->GetPageSize() ));
+ }
}
Any TitleWrapper::getReferenceSize()
{
@@ -502,8 +507,9 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties()
aWrappedProperties.push_back( new WrappedTitleStringProperty( m_spChart2ModelContact->m_xContext ) );
aWrappedProperties.push_back( new WrappedTextRotationProperty() );
aWrappedProperties.push_back( new WrappedStackedTextProperty() );
-// WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this );
+ WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties );
+ WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
return aWrappedProperties;
}
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 8c0d87bd440b..3e0db1ed1e42 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: TitleWrapper.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -68,7 +68,7 @@ public:
APPHELPER_XSERVICEINFO_DECL()
//ReferenceSizePropertyProvider
- virtual void setCurrentSizeAsReference();
+ virtual void updateReferenceSize();
virtual ::com::sun::star::uno::Any getReferenceSize();
virtual ::com::sun::star::awt::Size getCurrentSizeForReference();
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 48186e173df1..e2a74834d249 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: UpDownBarWrapper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -103,11 +103,6 @@ UpDownBarWrapper::UpDownBarWrapper(
, m_aPropertySetName( bUp ? C2U("WhiteDay") : C2U("BlackDay") )
, m_xInfo(0)
, m_pPropertyArrayHelper()
-// , m_aWrappedFillGradientNameProperty( m_spChart2ModelContact )
-// , m_aWrappedFillHatchNameProperty( m_spChart2ModelContact )
-// , m_aWrappedFillBitmapNameProperty( m_spChart2ModelContact )
-// , m_aWrappedFillTransparenceGradientNameProperty( m_spChart2ModelContact )
-// , m_aWrappedLineDashNameProperty( m_spChart2ModelContact )
{
}
@@ -192,20 +187,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const ::rtl::OUString& rProper
}
}
if(xPropSet.is())
- {
-// if( rPropertyName.equals( m_aWrappedFillGradientNameProperty.getOuterName() ) )
-// m_aWrappedFillGradientNameProperty.setPropertyValue( rValue, xPropSet );
-// else if( rPropertyName.equals( m_aWrappedFillHatchNameProperty.getOuterName() ) )
-// m_aWrappedFillHatchNameProperty.setPropertyValue( rValue, xPropSet );
-// else if( rPropertyName.equals( m_aWrappedFillBitmapNameProperty.getOuterName() ) )
-// m_aWrappedFillBitmapNameProperty.setPropertyValue( rValue, xPropSet );
-// else if( rPropertyName.equals( m_aWrappedFillTransparenceGradientNameProperty.getOuterName() ) )
-// m_aWrappedFillTransparenceGradientNameProperty.setPropertyValue( rValue, xPropSet );
-// else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
-// m_aWrappedLineDashNameProperty.setPropertyValue( rValue, xPropSet );
-// else
xPropSet->setPropertyValue( rPropertyName, rValue );
- }
}
uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPropertyName )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -229,20 +211,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const ::rtl::OUString& rPr
}
}
if(xPropSet.is())
- {
-// if( rPropertyName.equals( m_aWrappedFillGradientNameProperty.getOuterName() ) )
-// aRet = m_aWrappedFillGradientNameProperty.getPropertyValue( xPropSet );
-// else if( rPropertyName.equals( m_aWrappedFillHatchNameProperty.getOuterName() ) )
-// aRet = m_aWrappedFillHatchNameProperty.getPropertyValue( xPropSet );
-// else if( rPropertyName.equals( m_aWrappedFillBitmapNameProperty.getOuterName() ) )
-// aRet = m_aWrappedFillBitmapNameProperty.getPropertyValue( xPropSet );
-// else if( rPropertyName.equals( m_aWrappedFillTransparenceGradientNameProperty.getOuterName() ) )
-// aRet = m_aWrappedFillTransparenceGradientNameProperty.getPropertyValue( xPropSet );
-// else if( rPropertyName.equals( m_aWrappedLineDashNameProperty.getOuterName() ) )
-// aRet = m_aWrappedLineDashNameProperty.getPropertyValue( xPropSet );
-// else
aRet = xPropSet->getPropertyValue( rPropertyName );
- }
return aRet;
}
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index 0fac6a278e05..ce83ece0a4bf 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: UpDownBarWrapper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +32,6 @@
#include "ServiceMacros.hxx"
#include "MutexContainer.hxx"
-// #include "WrappedNamedProperty.hxx"
#include <cppuhelper/interfacecontainer.hxx>
@@ -132,11 +131,6 @@ private: //member
m_xInfo;//outer PropertySetInfo
::boost::shared_ptr< ::cppu::OPropertyArrayHelper > m_pPropertyArrayHelper;
-// WrappedFillGradientNameProperty m_aWrappedFillGradientNameProperty;
-// WrappedFillHatchNameProperty m_aWrappedFillHatchNameProperty;
-// WrappedFillBitmapNameProperty m_aWrappedFillBitmapNameProperty;
-// WrappedFillTransparenceGradientNameProperty m_aWrappedFillTransparenceGradientNameProperty;
-// WrappedLineDashNameProperty m_aWrappedLineDashNameProperty;
};
} // namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 740ad4a0959b..7e9aa4c6aeb9 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: WallFloorWrapper.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -39,11 +39,9 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
-// #include "NamedProperties.hxx"
#include "FillProperties.hxx"
#include "LineProperties.hxx"
#include "UserDefinedProperties.hxx"
-// #include "WrappedNamedProperty.hxx"
#include "WrappedDirectStateProperty.hxx"
#include <algorithm>
@@ -168,8 +166,6 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties(
{
::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
-// WrappedNamedProperty::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
-
// use direct state always, so that in XML the value is always
// exported. Because in the old chart the defaults is as follows:
// Floor: SOLID (new and old model default), Wall: NONE, except for some chart types (line, scatter)
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
new file mode 100644
index 000000000000..dfba4f0cf5ab
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -0,0 +1,159 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedAutomaticPositionProperties.cxx,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_chart2.hxx"
+
+#include "WrappedAutomaticPositionProperties.hxx"
+#include "FastPropertyIdRanges.hxx"
+#include "macros.hxx"
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/chart2/RelativePosition.hpp>
+
+using namespace ::com::sun::star;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::beans::Property;
+using ::rtl::OUString;
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedAutomaticPositionProperty : public WrappedProperty
+{
+public:
+ WrappedAutomaticPositionProperty();
+ virtual ~WrappedAutomaticPositionProperty();
+
+ virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException);
+ virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+ virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+};
+
+WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
+ : ::chart::WrappedProperty( C2U( "AutomaticPosition" ), rtl::OUString() )
+{
+}
+WrappedAutomaticPositionProperty::~WrappedAutomaticPositionProperty()
+{
+}
+
+void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ if( xInnerPropertySet.is() )
+ {
+ bool bNewValue = true;
+ if( ! (rOuterValue >>= bNewValue) )
+ throw lang::IllegalArgumentException( C2U("Property AutomaticPosition requires value of type boolean"), 0, 0 );
+
+ try
+ {
+ if( bNewValue )
+ {
+ Any aRelativePosition( xInnerPropertySet->getPropertyValue( C2U( "RelativePosition" ) ) );
+ if( aRelativePosition.hasValue() )
+ xInnerPropertySet->setPropertyValue( C2U( "RelativePosition" ), Any() );
+ }
+ }
+ catch( uno::Exception & ex )
+ {
+ ASSERT_EXCEPTION( ex );
+ }
+ }
+}
+
+Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
+ if( xInnerPropertySet.is() )
+ {
+ Any aRelativePosition( xInnerPropertySet->getPropertyValue( C2U( "RelativePosition" ) ) );
+ if( !aRelativePosition.hasValue() )
+ aRet <<= true;
+ }
+ return aRet;
+}
+
+Any WrappedAutomaticPositionProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ Any aRet;
+ aRet <<= false;
+ return aRet;
+}
+
+namespace
+{
+enum
+{
+ PROP_CHART_AUTOMATIC_POSITION = FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP
+};
+
+void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList )
+{
+ rList.push_back( new WrappedAutomaticPositionProperty() );
+}
+
+}//anonymous namespace
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//static
+void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties )
+{
+ rOutProperties.push_back(
+ Property( C2U( "AutomaticPosition" ),
+ PROP_CHART_AUTOMATIC_POSITION,
+ ::getBooleanCppuType(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+//static
+void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList )
+{
+ lcl_addWrappedProperties( rList );
+}
+
+} //namespace wrapper
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
new file mode 100644
index 000000000000..edb9127fcd31
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedAutomaticPositionProperties.hxx,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef CHART_WRAPPED_AUTOMATICPOSITION_PROPERTIES_HXX
+#define CHART_WRAPPED_AUTOMATICPOSITION_PROPERTIES_HXX
+
+#include "WrappedProperty.hxx"
+#include <vector>
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedAutomaticPositionProperties
+{
+public:
+ static void addProperties( ::std::vector< ::com::sun::star::beans::Property >& rOutProperties );
+ static void addWrappedProperties( std::vector< WrappedProperty* >& rList );
+};
+
+} //namespace wrapper
+} //namespace chart
+#endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index eeca8936727b..94f1c58fe27a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: WrappedCharacterHeightProperty.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -80,7 +80,7 @@ void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterVal
if(xInnerPropertySet.is())
{
if( m_pRefSizePropProvider )
- m_pRefSizePropProvider->setCurrentSizeAsReference();
+ m_pRefSizePropProvider->updateReferenceSize();
xInnerPropertySet->setPropertyValue( m_aInnerName, rOuterValue );
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx
index e84cfbfd27d4..e69de29bb2d1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.cxx
@@ -1,154 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: WrappedNamedProperty.cxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include "WrappedNamedProperty.hxx"
-#include "macros.hxx"
-
-using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
-
-
-//.............................................................................
-namespace chart
-{
-namespace wrapper
-{
-
-WrappedNamedProperty::WrappedNamedProperty(
- const OUString& rOuterName
- , const OUString& rInnerName
- , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedProperty( rOuterName, rInnerName )
- , m_spChart2ModelContact( spChart2ModelContact )
-{
-}
-WrappedNamedProperty::~WrappedNamedProperty()
-{
-}
-
-//static
-void WrappedNamedProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-{
- addWrappedFillProperties( rList, spChart2ModelContact );
- addWrappedLineProperties( rList, spChart2ModelContact );
-}
-
-//static
-void WrappedNamedProperty::addWrappedFillProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-{
- rList.push_back( new WrappedFillGradientNameProperty( spChart2ModelContact ) );
- rList.push_back( new WrappedFillHatchNameProperty( spChart2ModelContact ) );
- rList.push_back( new WrappedFillBitmapNameProperty( spChart2ModelContact ) );
- rList.push_back( new WrappedFillTransparenceGradientNameProperty( spChart2ModelContact ) );
-}
-
-//static
-void WrappedNamedProperty::addWrappedLineProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-{
- rList.push_back( new WrappedLineDashNameProperty( spChart2ModelContact ) );
-}
-
-::com::sun::star::uno::Any WrappedNamedProperty::convertInnerToOuterValue( const Any& rInnerValue ) const
-{
- Any aRet;
- ::rtl::OUString aName = m_spChart2ModelContact->GetNameOfListElement( rInnerValue, m_aOuterName );
- aRet <<= aName;
- return aRet;
-
-}
-Any WrappedNamedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
-{
- Any aRet;
- OUString aName;
- if( rOuterValue >>= aName )
- {
- aRet = m_spChart2ModelContact->GetListElementByName( aName, m_aOuterName );
- }
- return aRet;
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-WrappedFillGradientNameProperty::WrappedFillGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedNamedProperty( C2U( "FillGradientName" ), C2U( "FillGradient" ), spChart2ModelContact )
-{
-}
-WrappedFillGradientNameProperty::~WrappedFillGradientNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedFillHatchNameProperty::WrappedFillHatchNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedNamedProperty( C2U( "FillHatchName" ), C2U( "FillHatch" ), spChart2ModelContact )
-{
-}
-WrappedFillHatchNameProperty::~WrappedFillHatchNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedFillBitmapNameProperty::WrappedFillBitmapNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedNamedProperty( C2U( "FillBitmapName" ), C2U( "FillBitmap" ), spChart2ModelContact )
-{
-}
-WrappedFillBitmapNameProperty::~WrappedFillBitmapNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedFillTransparenceGradientNameProperty::WrappedFillTransparenceGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedNamedProperty( C2U( "FillTransparenceGradientName" ), C2U( "FillTransparenceGradient" ), spChart2ModelContact )
-{
-}
-WrappedFillTransparenceGradientNameProperty::~WrappedFillTransparenceGradientNameProperty()
-{
-}
-
-//-----------------------------------------------------------------------------
-
-WrappedLineDashNameProperty::WrappedLineDashNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : WrappedNamedProperty( C2U( "LineDashName" ), C2U( "LineDash" ), spChart2ModelContact )
-{
-}
-WrappedLineDashNameProperty::~WrappedLineDashNameProperty()
-{
-}
-
-} //namespace wrapper
-} //namespace chart
-//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx
index 9ee92c269956..e69de29bb2d1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNamedProperty.hxx
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: WrappedNamedProperty.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_WRAPPEDNAMEDPROPERTY_HXX
-#define CHART_WRAPPEDNAMEDPROPERTY_HXX
-
-#include "WrappedProperty.hxx"
-#include "Chart2ModelContact.hxx"
-
-#include <boost/shared_ptr.hpp>
-#include <vector>
-
-//.............................................................................
-namespace chart
-{
-namespace wrapper
-{
-
-class WrappedNamedProperty : public WrappedProperty
-{
-public:
- WrappedNamedProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- virtual ~WrappedNamedProperty();
-
- static void addWrappedProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- static void addWrappedFillProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- static void addWrappedLineProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
-
-protected:
- virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const;
- virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const;
-
-protected:
- ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillGradientNameProperty : public WrappedNamedProperty
-{
-public:
- WrappedFillGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- virtual ~WrappedFillGradientNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillHatchNameProperty : public WrappedNamedProperty
-{
-public:
- WrappedFillHatchNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- virtual ~WrappedFillHatchNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillBitmapNameProperty : public WrappedNamedProperty
-{
-public:
- WrappedFillBitmapNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- virtual ~WrappedFillBitmapNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-
-class WrappedFillTransparenceGradientNameProperty : public WrappedNamedProperty
-{
-public:
- WrappedFillTransparenceGradientNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- virtual ~WrappedFillTransparenceGradientNameProperty();
-};
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-class WrappedLineDashNameProperty : public WrappedNamedProperty
-{
-public:
- WrappedLineDashNameProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
- virtual ~WrappedLineDashNameProperty();
-};
-
-} //namespace wrapper
-} //namespace chart
-//.............................................................................
-
-// CHART_WRAPPEDNAMEDPROPERTY_HXX
-#endif
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
new file mode 100644
index 000000000000..5a22ae7f184f
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -0,0 +1,170 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedScaleTextProperties.cxx,v $
+ * $Revision: 1.1.2.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_chart2.hxx"
+
+#include "WrappedScaleTextProperties.hxx"
+#include "FastPropertyIdRanges.hxx"
+#include "macros.hxx"
+
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+
+using namespace ::com::sun::star;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::beans::Property;
+using ::rtl::OUString;
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedScaleTextProperty : public WrappedProperty
+{
+public:
+ WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+ virtual ~WrappedScaleTextProperty();
+
+ virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException);
+ virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+ virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
+
+private:
+ ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
+};
+
+WrappedScaleTextProperty::WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+ : ::chart::WrappedProperty( C2U( "ScaleText" ), rtl::OUString() )
+ , m_spChart2ModelContact( spChart2ModelContact )
+{
+}
+
+WrappedScaleTextProperty::~WrappedScaleTextProperty()
+{
+}
+
+void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") );
+
+ if( xInnerPropertySet.is() )
+ {
+ bool bNewValue = false;
+ if( ! (rOuterValue >>= bNewValue) )
+ {
+ if( rOuterValue.hasValue() )
+ throw lang::IllegalArgumentException( C2U("Property ScaleText requires value of type boolean"), 0, 0 );
+ }
+
+ try
+ {
+ if( bNewValue )
+ {
+ awt::Size aRefSize( m_spChart2ModelContact->GetPageSize() );
+ xInnerPropertySet->setPropertyValue( aRefSizeName, uno::makeAny( aRefSize ) );
+ }
+ else
+ xInnerPropertySet->setPropertyValue( aRefSizeName, Any() );
+ }
+ catch( uno::Exception & ex )
+ {
+ ASSERT_EXCEPTION( ex );
+ }
+ }
+}
+
+Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize") );
+
+ Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
+ if( xInnerPropertySet.is() )
+ {
+ if( xInnerPropertySet->getPropertyValue( aRefSizeName ).hasValue() )
+ aRet <<= true;
+ else
+ aRet <<= false;
+ }
+
+ return aRet;
+}
+
+Any WrappedScaleTextProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+{
+ Any aRet;
+ aRet <<= false;
+ return aRet;
+}
+
+namespace
+{
+enum
+{
+ PROP_CHART_SCALE_TEXT = FAST_PROPERTY_ID_START_SCALE_TEXT_PROP
+};
+
+}//anonymous namespace
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//static
+void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties )
+{
+ rOutProperties.push_back(
+ Property( C2U( "ScaleText" ),
+ PROP_CHART_SCALE_TEXT,
+ ::getBooleanCppuType(),
+ beans::PropertyAttribute::MAYBEVOID
+ | beans::PropertyAttribute::MAYBEDEFAULT ));
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+//static
+void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
+ , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
+{
+ rList.push_back( new WrappedScaleTextProperty( spChart2ModelContact ) );
+}
+
+} //namespace wrapper
+} //namespace chart
+//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
new file mode 100644
index 000000000000..433a91254bcc
--- /dev/null
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: WrappedScaleTextProperties.hxx,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef CHART_WRAPPED_SCALETEXT_PROPERTIES_HXX
+#define CHART_WRAPPED_SCALETEXT_PROPERTIES_HXX
+
+#include "WrappedProperty.hxx"
+#include "Chart2ModelContact.hxx"
+
+#include <boost/shared_ptr.hpp>
+#include <vector>
+
+//.............................................................................
+namespace chart
+{
+namespace wrapper
+{
+
+class WrappedScaleTextProperties
+{
+public:
+ static void addProperties( ::std::vector< ::com::sun::star::beans::Property >& rOutProperties );
+ static void addWrappedProperties( std::vector< WrappedProperty* >& rList
+ , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
+};
+
+} //namespace wrapper
+} //namespace chart
+//.............................................................................
+#endif
diff --git a/chart2/source/controller/chartapiwrapper/makefile.mk b/chart2/source/controller/chartapiwrapper/makefile.mk
index 6a4f4ce0fd8e..e5b742e54346 100644
--- a/chart2/source/controller/chartapiwrapper/makefile.mk
+++ b/chart2/source/controller/chartapiwrapper/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.4.44.3 $
#
# This file is part of OpenOffice.org.
#
@@ -58,7 +58,7 @@ SLOFILES= \
$(SLO)$/MinMaxLineWrapper.obj \
$(SLO)$/UpDownBarWrapper.obj \
$(SLO)$/WallFloorWrapper.obj \
- $(SLO)$/WrappedNamedProperty.obj \
+ $(SLO)$/WrappedAutomaticPositionProperties.obj \
$(SLO)$/WrappedCharacterHeightProperty.obj \
$(SLO)$/WrappedDataCaptionProperties.obj \
$(SLO)$/WrappedTextRotationProperty.obj \
@@ -72,7 +72,8 @@ SLOFILES= \
$(SLO)$/WrappedStatisticProperties.obj \
$(SLO)$/WrappedSceneProperty.obj \
$(SLO)$/WrappedSeriesAreaOrLineProperty.obj \
- $(SLO)$/WrappedAddInProperty.obj
+ $(SLO)$/WrappedAddInProperty.obj \
+ $(SLO)$/WrappedScaleTextProperties.obj
# --- Targets -----------------------------------------------------------------
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index ccc4bfa8c7df..6dbce3afac61 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataBrowser.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -228,9 +228,6 @@ public:
void SetGetFocusHdl( const Link& rLink );
void SetEditChangedHdl( const Link & rLink );
- const Link & GetEditChangedHdl() const;
-
- ::boost::shared_ptr< SeriesHeaderEdit > GetSeriesNameEditField() const;
bool HasFocus() const;
@@ -395,11 +392,6 @@ void SeriesHeader::SetEditChangedHdl( const Link & rLink )
m_aChangeLink = rLink;
}
-const Link & SeriesHeader::GetEditChangedHdl() const
-{
- return m_aChangeLink;
-}
-
IMPL_LINK( SeriesHeader, SeriesNameChanged, void * , EMPTYARG )
{
notifyChanges();
@@ -417,11 +409,6 @@ void SeriesHeader::SetGetFocusHdl( const Link& rLink )
m_spSeriesName->SetGetFocusHdl( rLink );
}
-::boost::shared_ptr< SeriesHeaderEdit > SeriesHeader::GetSeriesNameEditField() const
-{
- return m_spSeriesName;
-}
-
bool SeriesHeader::HasFocus() const
{
return m_spSeriesName->HasFocus();
@@ -798,11 +785,6 @@ bool DataBrowser::IsReadOnly() const
}
-bool DataBrowser::IsDirty() const
-{
- return m_bIsDirty;
-}
-
void DataBrowser::SetClean()
{
m_bIsDirty = false;
@@ -1033,50 +1015,6 @@ void DataBrowser::SetCursorMovedHdl( const Link& rLink )
m_aCursorMovedHdlLink = rLink;
}
-const Link& DataBrowser::GetCursorMovedHdl() const
-{
- return m_aCursorMovedHdlLink;
-}
-
-// void DataBrowser::QuickSortCol()
-// {
-// DeactivateCell();
-// m_apMemChart->SortCols( GetCurRow () - 1 );
-// m_pLogBook->SetValid( FALSE );
-// Invalidate();
-// ActivateCell();
-// SetDirty();
-// }
-
-// void DataBrowser::QuickSortRow()
-// {
-// DeactivateCell();
-// m_apMemChart->SortRows( GetCurColumnId () - 2 );
-// m_pLogBook->SetValid( FALSE );
-// Invalidate();
-// ActivateCell();
-// SetDirty();
-// }
-
-// void DataBrowser::QuickSortTableCols ()
-// {
-// DeactivateCell();
-// m_apMemChart->SortTableRows( GetCurColumnId () - 2 );
-// m_pLogBook->SetValid( FALSE );
-// Invalidate();
-// ActivateCell();
-// SetDirty();
-// }
-
-// void DataBrowser::QuickSortTableRows ()
-// {
-// m_apMemChart->SortTableCols( GetCurRow () - 1 );
-// m_pLogBook->SetValid( FALSE );
-// Invalidate();
-// ActivateCell();
-// SetDirty();
-// }
-
// implementations for ::svt::EditBrowseBox (pure virtual methods)
void DataBrowser::PaintCell(
OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index b43cc19b9822..a4147af84fcb 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataBrowser.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -103,8 +103,6 @@ public:
bool SetReadOnly( bool bNewState );
bool IsReadOnly() const;
- /// @return true, if data has been modified
- bool IsDirty() const;
/// reset the dirty status, if changes have been saved
void SetClean();
@@ -141,15 +139,7 @@ public:
void SwapRow();
void SwapColumn();
-// void QuickSortRow();
-// void QuickSortCol();
-
- // sorting the entire table
-// void QuickSortTableCols ();
-// void QuickSortTableRows ();
-
void SetCursorMovedHdl( const Link& rLink );
- const Link& GetCursorMovedHdl() const;
void SetCellModifiedHdl( const Link& rLink );
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 258a4c924b2e..6b6d682186c5 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataBrowserModel.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.16.2 $
*
* This file is part of OpenOffice.org.
*
@@ -298,14 +298,6 @@ DataBrowserModel::DataBrowserModel(
DataBrowserModel::~DataBrowserModel()
{}
-
-void DataBrowserModel::setModel(
- const Reference< chart2::XChartDocument > & xChartDoc )
-{
- m_xChartDocument.set( xChartDoc );
- m_apDialogModel.reset( new DialogModel( xChartDoc, m_xContext ));
-}
-
namespace
{
struct lcl_DataSeriesOfHeaderMatches : public ::std::unary_function< ::chart::DataBrowserModel::tDataHeader, bool >
@@ -641,15 +633,6 @@ bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const
setCellAny( nAtColumn, nAtRow, uno::makeAny( rText ));
}
-Reference< chart2::data::XLabeledDataSequence >
- DataBrowserModel::getDataOfColumn( sal_Int32 nColumnIndex ) const
-{
- if( 0 <= nColumnIndex &&
- static_cast< tDataColumnVector::size_type >( nColumnIndex ) < m_aColumns.size())
- return m_aColumns[ nColumnIndex ].m_xLabeledDataSequence;
- return Reference< chart2::data::XLabeledDataSequence >();
-}
-
sal_Int32 DataBrowserModel::getColumnCount() const
{
return static_cast< sal_Int32 >( m_aColumns.size());
@@ -773,13 +756,19 @@ void DataBrowserModel::updateFromModel()
nHeaderEnd = nHeaderStart;
// @todo: dimension index 1 for y-values used here. This is just a guess
- sal_Int32 nNumberFormatKey =
+ sal_Int32 nYAxisNumberFormatKey =
DataSeriesHelper::getNumberFormatKeyFromAxis(
aSeries[nSeriesIdx], aCooSysSeq[nCooSysIdx], 1 );
sal_Int32 nSeqIdx=0;
for( ; nSeqIdx<aLSeqs.getLength(); ++nSeqIdx )
{
+ sal_Int32 nSequenceNumberFormatKey = nYAxisNumberFormatKey;
+ OUString aRole = lcl_getRole( aLSeqs[nSeqIdx] );
+ if( aRole.equals( C2U( "values-x" ) ) )
+ nSequenceNumberFormatKey = DataSeriesHelper::getNumberFormatKeyFromAxis(
+ aSeries[nSeriesIdx], aCooSysSeq[nCooSysIdx], 0, 0 );
+
if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end())
{
@@ -791,7 +780,7 @@ void DataBrowserModel::updateFromModel()
lcl_getUIRoleName( aLSeqs[nSeqIdx] ),
aLSeqs[nSeqIdx],
NUMBER,
- nNumberFormatKey ));
+ nSequenceNumberFormatKey ));
++nHeaderEnd;
}
// else skip
@@ -809,7 +798,7 @@ void DataBrowserModel::updateFromModel()
// add ranges for error bars if present for a series
if( StatisticsHelper::usesErrorBarRanges( aSeries[nSeriesIdx], /* bYError = */ true ))
- addErrorBarRanges( aSeries[nSeriesIdx], nNumberFormatKey, nSeqIdx, nHeaderEnd );
+ addErrorBarRanges( aSeries[nSeriesIdx], nYAxisNumberFormatKey, nSeqIdx, nHeaderEnd );
m_aHeaders.push_back(
tDataHeader(
@@ -829,10 +818,6 @@ void DataBrowserModel::updateFromModel()
}
}
-void DataBrowserModel::applyToModel()
-{
-}
-
void DataBrowserModel::addErrorBarRanges(
const Reference< chart2::XDataSeries > & xDataSeries,
sal_Int32 nNumberFormatKey,
@@ -911,13 +896,4 @@ void DataBrowserModel::addErrorBarRanges(
}
}
-// static
-void DataBrowserModel::restoreModel(
- const Reference< chart2::XChartDocument > & xSource,
- const Reference< chart2::XChartDocument > & xDestination )
-{
- DialogModel::restoreModel( xSource, xDestination );
-}
-
-
} // namespace chart
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index dad462b62c6c..95a3e4b2f0fa 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataBrowserModel.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -58,10 +58,6 @@ public:
::com::sun::star::uno::XComponentContext > & xContext );
virtual ~DataBrowserModel();
- void setModel(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xChartDoc );
-
/** Inserts a new data series after the data series to which the data column
with index nAfterColumnIndex belongs.
*/
@@ -101,22 +97,10 @@ public:
sal_Int32 getColumnCount() const;
sal_Int32 getMaxRowCount() const;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XLabeledDataSequence >
- getDataOfColumn( sal_Int32 nColumnIndex ) const;
+
// returns the UI string of the corresponding role
::rtl::OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const;
- /** Applies the content of xSource to xDestination. As a result
- xDestination is a copy of xSource, but maintains its identity.
- (Something like a flat assignment operator)
- */
- static void restoreModel(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xSource,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xDestination );
-
struct tDataHeader
{
::com::sun::star::uno::Reference<
@@ -164,7 +148,6 @@ public:
private:
void updateFromModel();
- void applyToModel();
void addErrorBarRanges(
const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index e980b1550996..28d9f6420419 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DialogModel.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -717,37 +717,6 @@ bool DialogModel::setData(
}
// static
-void DialogModel::restoreModel(
- const Reference< chart2::XChartDocument > & xSource,
- const Reference< chart2::XChartDocument > & xDestination )
-{
- ControllerLockGuard aLockedControllers( Reference< frame::XModel >( xDestination, uno::UNO_QUERY ) );
-
- if( xSource.is() && xDestination.is())
- {
- try
- {
- // diagram
- xDestination->setFirstDiagram( xSource->getFirstDiagram());
-
- // main title
- Reference< chart2::XTitled > xDestinationTitled( xDestination, uno::UNO_QUERY_THROW );
- Reference< chart2::XTitled > xSourceTitled( xSource, uno::UNO_QUERY_THROW );
- xDestinationTitled->setTitleObject( xSourceTitled->getTitleObject());
-
- // page background
- comphelper::copyProperties(
- xSource->getPageBackground(),
- xDestination->getPageBackground() );
- }
- catch( uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
- }
-}
-
-// static
OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString )
{
return lcl_ConvertRole( rRoleString, true );
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 7424630bcbdc..65579ab652be 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DialogModel.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -153,16 +153,6 @@ public:
void startControllerLockTimer();
- /** Applies the content of xSource to xDestination. As a result
- xDestination is a copy of xSource, but maintains its identity.
- (Something like a flat assignment operator)
- */
- static void restoreModel(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xSource,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xDestination );
-
static ::rtl::OUString ConvertRoleFromInternalToUI( const ::rtl::OUString & rRoleString );
static ::rtl::OUString ConvertRoleFromUIToInternal( const ::rtl::OUString & rRoleString );
static ::rtl::OUString GetRoleDataLabel();
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index 677e287fe18e..88f93413ce67 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: RangeSelectionHelper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,57 +55,6 @@ using ::rtl::OUString;
// ----------------------------------------
-namespace
-{
-OUString lcl_getTextFromRanges( const Sequence < Reference< table::XCellRange > >& xRanges )
-{
- ::rtl::OUStringBuffer aResultBuf;
-
- try
- {
- sal_Int32 nCount(xRanges.getLength());
- for (sal_Int32 i = 0; i < nCount; ++i)
- {
- Reference< sheet::XCellRangeAddressable > xAddressable( xRanges[i], uno::UNO_QUERY );
- if( xAddressable.is())
- {
- // iterate through columns first
- table::CellRangeAddress aAddr = xAddressable->getRangeAddress();
- bool bInsSpace = false;
- for( sal_Int32 nCol=aAddr.StartColumn; nCol<=aAddr.EndColumn; ++nCol )
- for( sal_Int32 nRow=aAddr.StartRow; nRow<=aAddr.EndRow; ++nRow )
- {
- if( bInsSpace )
- aResultBuf.append( sal_Unicode( ' ' ));
- else
- bInsSpace = true;
- Reference< text::XText > xText( xRanges[i]->getCellByPosition(
- nCol - aAddr.StartColumn,
- nRow - aAddr.StartRow ), uno::UNO_QUERY );
- if( xText.is())
- aResultBuf.append( xText->getString());
- }
- }
- else if (xRanges[i].is())
- {
- // assert that (0,0) is valid. Otherwise an exception is thrown
- Reference< text::XText > xText( xRanges[i]->getCellByPosition( 0, 0 ), uno::UNO_QUERY );
- if( xText.is() )
- aResultBuf.append( xText->getString());
- }
- }
- }
- catch( uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
-
- return aResultBuf.makeStringAndClear();
-}
-} // anonymous namespace
-
-// ----------------------------------------
-
namespace chart
{
@@ -144,37 +93,6 @@ Reference< sheet::XRangeSelection > RangeSelectionHelper::getRangeSelection()
return m_xRangeSelection;
}
-Reference< sheet::XCellRangesAccess > RangeSelectionHelper::getCellRangesAccess()
-{
- if( ! m_xCellRangesAccess.is() &&
- m_xChartDocument.is())
- {
- try
- {
- Reference< sheet::XSpreadsheetDocument > xSpreadDoc;
-
- // try controller
- Reference< chart2::data::XDataProvider > xDataProvider( m_xChartDocument->getDataProvider());
- if( xDataProvider.is())
- {
- Reference< frame::XController > xCtrl( xDataProvider->getRangeSelection(), uno::UNO_QUERY );
-
- if( xCtrl.is() )
- xSpreadDoc.set( xCtrl->getModel(), uno::UNO_QUERY_THROW );
- }
-
- if( xSpreadDoc.is() )
- m_xCellRangesAccess.set( xSpreadDoc->getSheets(), uno::UNO_QUERY );
- }
- catch( uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
- }
-
- return m_xCellRangesAccess;
-}
-
void RangeSelectionHelper::raiseRangeSelectionDocument()
{
Reference< sheet::XRangeSelection > xRangeSel( getRangeSelection());
@@ -280,26 +198,4 @@ bool RangeSelectionHelper::verifyArguments( const Sequence< beans::PropertyValue
return xDataProvider->createDataSourcePossible( rArguments );
}
-OUString RangeSelectionHelper::getCellRangeContent( const OUString & rRangeStr )
-{
- OUString aResult;
-
- Reference< sheet::XCellRangesAccess > xRangesAccess( getCellRangesAccess());
- if( xRangesAccess.is())
- {
- // @todo: the interface should provide a method to determine if a cell
- // range is correct, rather than waiting for an exception
- try
- {
- aResult = lcl_getTextFromRanges( xRangesAccess->getCellRangesByName( rRangeStr ) );
- }
- catch( const uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
- }
-
- return aResult;
-}
-
} // namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 5d4d28c07fec..e6b74c8e660a 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dlg_InsertErrorBars.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -78,11 +78,6 @@ InsertErrorBarsDialog::~InsertErrorBarsDialog()
{
}
-void InsertErrorBarsDialog::Reset()
-{
- m_apErrorBarResources->Reset(rInAttrs);
-}
-
void InsertErrorBarsDialog::FillItemSet(SfxItemSet& rOutAttrs)
{
m_apErrorBarResources->FillItemSet(rOutAttrs);
diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
index 9faed6426eb3..95c9754f3b7e 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dlg_InsertTrendline.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -98,11 +98,6 @@ void InsertTrendlineDialog::adjustSize()
SetSizePixel( aDialogSize );
}
-void InsertTrendlineDialog::Reset()
-{
- m_apTrendlineResources->Reset(rInAttrs);
-}
-
void InsertTrendlineDialog::FillItemSet(SfxItemSet& rOutAttrs)
{
m_apTrendlineResources->FillItemSet(rOutAttrs);
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index bf8362d46050..ad8baae5b417 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dlg_ObjectProperties.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.23.42.3 $
*
* This file is part of OpenOffice.org.
*
@@ -102,12 +102,10 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const rtl::OUS
, m_aLocalizedName()
, m_bHasGeometryProperties(false)
, m_bHasStatisticProperties(false)
- , m_bHasRegressionProperties(false)
, m_bProvidesSecondaryYAxis(false)
, m_bProvidesOverlapAndGapWidth(false)
, m_bProvidesBarConnectors(false)
, m_bHasAreaProperties(false)
- , m_bHasLineProperties(false)
, m_bHasSymbolProperties(false)
, m_bHasScaleProperties(false)
, m_bCanAxisLabelsBeStaggered(false)
@@ -151,7 +149,6 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
if( bHasSeriesProperties )
{
m_bHasStatisticProperties = ChartTypeHelper::isSupportingStatisticProperties( xChartType, nDimensionCount );
- m_bHasRegressionProperties = ChartTypeHelper::isSupportingRegressionProperties( xChartType, nDimensionCount );
m_bProvidesSecondaryYAxis = ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, 1 );
m_bProvidesOverlapAndGapWidth = ChartTypeHelper::isSupportingOverlapAndGapWidthProperties( xChartType, nDimensionCount );
m_bProvidesBarConnectors = ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount );
@@ -161,12 +158,9 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
.getLength() ? true : false;
}
}
- m_bHasLineProperties = true; //@todo ask object
if( OBJECTTYPE_DATA_ERRORS == m_eObjectType )
m_bHasStatisticProperties = true;
- else if( OBJECTTYPE_DATA_CURVE == m_eObjectType )
- m_bHasRegressionProperties = true;
if( OBJECTTYPE_AXIS == m_eObjectType )
{
@@ -217,10 +211,6 @@ bool ObjectPropertiesDialogParameter::HasStatisticProperties() const
{
return m_bHasStatisticProperties;
}
-bool ObjectPropertiesDialogParameter::HasRegressionProperties() const
-{
- return m_bHasRegressionProperties;
-}
bool ObjectPropertiesDialogParameter::ProvidesSecondaryYAxis() const
{
return m_bProvidesSecondaryYAxis;
@@ -237,10 +227,6 @@ bool ObjectPropertiesDialogParameter::HasAreaProperties() const
{
return m_bHasAreaProperties;
}
-bool ObjectPropertiesDialogParameter::HasLineProperties() const
-{
- return m_bHasLineProperties;
-}
bool ObjectPropertiesDialogParameter::HasSymbolProperties() const
{
return m_bHasSymbolProperties;
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index a8b5bc5f4700..a98ce3833e56 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: res_BarGeometry.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -63,10 +63,6 @@ void BarGeometryResources::SetPosPixel( const Point& rPosition )
m_aFT_Geometry.SetPosPixel( rPosition );
m_aLB_Geometry.SetPosPixel( Point( rPosition.X()+aDistanceSize.Width(), rPosition.Y()+m_aFT_Geometry.GetSizePixel().Height()+aDistanceSize.Height()) );
}
-Point BarGeometryResources::GetPosPixel() const
-{
- return m_aFT_Geometry.GetPosPixel();
-}
Size BarGeometryResources::GetSizePixel() const
{
long nHeight = m_aLB_Geometry.GetPosPixel().Y()
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx
index c098b8e5f156..8bf2d81259a3 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: res_BarGeometry.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -47,7 +47,6 @@ public:
virtual ~BarGeometryResources();
void SetPosPixel( const Point& rPosition );
- Point GetPosPixel() const;
Size GetSizePixel() const;
void Show( bool bShow );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 2a2a8870e1ab..eb5aef2a8375 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tp_ChartType.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.8.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -166,7 +166,6 @@ public:
virtual ~Dim3DLookResourceGroup();
void showControls( bool bShow );
- Point getPosition();
long getHeight();
void setPosition( const Point& rPoint );
@@ -202,10 +201,6 @@ void Dim3DLookResourceGroup::showControls( bool bShow )
m_aCB_3DLook.Show(bShow);
m_aLB_Scheme.Show(bShow);
}
-Point Dim3DLookResourceGroup::getPosition()
-{
- return m_aCB_3DLook.GetPosPixel();
-}
long Dim3DLookResourceGroup::getHeight()
{
return m_aCB_3DLook.GetSizePixel().Height() + m_aLB_Scheme.LogicToPixel( Size(0,2), MapMode(MAP_APPFONT) ).Height();
@@ -266,7 +261,6 @@ public:
virtual ~SortByXValuesResourceGroup();
void showControls( bool bShow );
- Point getPosition();
long getHeight();
void setPosition( const Point& rPoint );
@@ -292,10 +286,6 @@ void SortByXValuesResourceGroup::showControls( bool bShow )
{
m_aCB_XValueSorting.Show(bShow);
}
-Point SortByXValuesResourceGroup::getPosition()
-{
- return m_aCB_XValueSorting.GetPosPixel();
-}
long SortByXValuesResourceGroup::getHeight()
{
return m_aCB_XValueSorting.GetSizePixel().Height();
@@ -730,7 +720,6 @@ public:
virtual ~GeometryResourceGroup();
void showControls( bool bShow );
- Point getPosition();
long getHeight();
void setPosition( const Point& rPoint );
@@ -756,10 +745,6 @@ void GeometryResourceGroup::showControls( bool bShow )
{
m_aGeometryResources.Show(bShow);
}
-Point GeometryResourceGroup::getPosition()
-{
- return m_aGeometryResources.GetPosPixel();
-}
long GeometryResourceGroup::getHeight()
{
return m_aGeometryResources.GetSizePixel().Height();
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 9a42b96a4a8a..77c861d529e9 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tp_DataSource.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.5.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -573,31 +573,6 @@ void DataSourceTabPage::updateControlState()
isValid();
}
-
-void DataSourceTabPage::disableAll()
-{
- m_aFT_SERIES.Disable();
- m_apLB_SERIES->Disable();
-
- m_aBTN_ADD.Disable();
- m_aBTN_REMOVE.Disable();
-
- m_aFT_ROLE.Disable();
- m_aLB_ROLE.Disable();
-
- m_aFT_RANGE.Disable();
- m_aEDT_RANGE.Disable();
- m_aIMB_RANGE_MAIN.Disable();
-
- m_aFT_CATEGORIES.Disable();
- m_aFT_DATALABELS.Disable();
- m_aEDT_CATEGORIES.Disable();
- m_aIMB_RANGE_CAT.Disable();
-
- m_aBTN_UP.Disable();
- m_aBTN_DOWN.Disable();
-}
-
IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG )
{
m_rDialogModel.startControllerLockTimer();
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 39068e891a27..2703836d5d1d 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tp_DataSource.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.4.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -119,9 +119,6 @@ protected:
*/
bool updateModelFromControl( Edit * pField = 0 );
- /// disable all controls (while Calc range chooser is active)
- void disableAll();
-
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >
getSelectionRangeListener();
diff --git a/chart2/source/controller/dialogs/tp_Location.cxx b/chart2/source/controller/dialogs/tp_Location.cxx
index 45b3287a8079..cce4cd520b12 100644
--- a/chart2/source/controller/dialogs/tp_Location.cxx
+++ b/chart2/source/controller/dialogs/tp_Location.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tp_Location.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -44,6 +44,7 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
+#ifdef LOCATION_PAGE
LocationTabPage::LocationTabPage( svt::OWizardMachine* pParent
, const uno::Reference< XChartDocument >& xChartModel
@@ -67,7 +68,7 @@ bool LocationTabPage::canAdvance() const
{
return false;
}
-
+#endif
//.............................................................................
} //namespace chart
//.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_Location.hxx b/chart2/source/controller/dialogs/tp_Location.hxx
index 8c128e0b4eec..8b472d2a6c92 100644
--- a/chart2/source/controller/dialogs/tp_Location.hxx
+++ b/chart2/source/controller/dialogs/tp_Location.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tp_Location.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -48,7 +48,7 @@ namespace chart
//-----------------------------------------------------------------------------
/**
*/
-
+#ifdef LOCATION_PAGE
class LocationTabPage : public svt::OWizardPage
{
public:
@@ -71,6 +71,7 @@ protected:
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext> m_xCC;
};
+#endif
//.............................................................................
} //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 32f411a0500e..2c2bc3fc6892 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tp_RangeChooser.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.5.44.2 $
*
* This file is part of OpenOffice.org.
*
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index db38da850678..01062ba4c0f1 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tp_RangeChooser.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.5.44.2 $
*
* This file is part of OpenOffice.org.
*
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 3fbe604c72f5..f2dde8aa7b8f 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: GraphicPropertyItemConverter.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -74,11 +74,6 @@ protected:
virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
throw( ::com::sun::star::uno::Exception );
- void FillBitmapItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
- throw( ::com::sun::star::beans::UnknownPropertyException );
- void ApplyBitmapItem( USHORT nWhichId, const SfxItemSet & rItemSet )
- throw( ::com::sun::star::beans::UnknownPropertyException );
-
private:
eGraphicObjectType m_eGraphicObjectType;
SdrModel & m_rDrawModel;
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 517cd4a54d48..9f21d00dd0a1 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ItemConverter.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -128,17 +128,6 @@ public:
*/
SfxItemSet CreateEmptyItemSet() const;
- /** States whether conversion is still likely to work.
-
- In particular, it is checked if the XPropertySet given in the CTOR is
- still valid, i.e. not disposed. It is assumed that the XPropertySet is
- valid when the converter is constructed.
-
- This only works if the XPropertySet given in the CTOR supports the
- interface ::com::sun::star::lang::XComponent.
- */
- bool IsValid() const;
-
/** Invalidates all items in rDestSet, that are set (state SFX_ITEM_SET) in
both item sets (rDestSet and rSourceSet) and have differing content.
*/
diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx
index a715d6585244..ec280b0da2e8 100755
--- a/chart2/source/controller/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: RangeSelectionHelper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -57,8 +57,6 @@ public:
bool hasRangeSelection();
::com::sun::star::uno::Reference<
::com::sun::star::sheet::XRangeSelection > getRangeSelection();
- ::com::sun::star::uno::Reference<
- ::com::sun::star::sheet::XCellRangesAccess > getCellRangesAccess();
void raiseRangeSelectionDocument();
bool chooseRange(
const ::rtl::OUString & aCurrentRange,
@@ -67,7 +65,6 @@ public:
void stopRangeListening( bool bRemoveListener = true );
bool verifyCellRange( const ::rtl::OUString & rRangeStr );
bool verifyArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments );
- ::rtl::OUString getCellRangeContent( const ::rtl::OUString & rRangeStr );
private:
::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index d5ab8118180b..13382ff9bffa 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dlg_InsertErrorBars.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -65,7 +65,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
private:
- void Reset();
const SfxItemSet & rInAttrs;
OKButton aBtnOK;
diff --git a/chart2/source/controller/inc/dlg_InsertTrendline.hxx b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
index 4e1ca9eeeff8..517da8fb6930 100644
--- a/chart2/source/controller/inc/dlg_InsertTrendline.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTrendline.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dlg_InsertTrendline.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,7 +55,6 @@ public:
void adjustSize();
private:
- void Reset();
const SfxItemSet & rInAttrs;
OKButton aBtnOK;
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 7999de0d5ea1..3eee59149103 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dlg_ObjectProperties.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.11.42.3 $
*
* This file is part of OpenOffice.org.
*
@@ -53,12 +53,10 @@ public:
bool HasGeometryProperties() const;
bool HasStatisticProperties() const;
- bool HasRegressionProperties() const;
bool ProvidesSecondaryYAxis() const;
bool ProvidesOverlapAndGapWidth() const;
bool ProvidesBarConnectors() const;
bool HasAreaProperties() const;
- bool HasLineProperties() const;
bool HasSymbolProperties() const;
bool HasScaleProperties() const;
bool CanAxisLabelsBeStaggered() const;
@@ -78,12 +76,10 @@ private:
bool m_bHasGeometryProperties;
bool m_bHasStatisticProperties;
- bool m_bHasRegressionProperties;
bool m_bProvidesSecondaryYAxis;
bool m_bProvidesOverlapAndGapWidth;
bool m_bProvidesBarConnectors;
bool m_bHasAreaProperties;
- bool m_bHasLineProperties;
bool m_bHasSymbolProperties;
bool m_bHasScaleProperties;
bool m_bCanAxisLabelsBeStaggered;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index cf9209ed3df5..f827b7893cf6 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AxisItemConverter.cxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -111,7 +111,7 @@ AxisItemConverter::AxisItemConverter(
xNamedPropertyContainerFactory,
GraphicPropertyItemConverter::LINE_PROPERTIES ));
m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
- C2U( "ReferenceDiagramSize" ) ));
+ C2U( "ReferencePageSize" ) ));
m_xAxis.set( Reference< chart2::XAxis >( rPropertySet, uno::UNO_QUERY ) );
OSL_ASSERT( m_xAxis.is());
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 0ef301f5b6bb..4593230d65cc 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataPointItemConverter.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -244,7 +244,7 @@ DataPointItemConverter::DataPointItemConverter(
m_aConverters.push_back( new GraphicPropertyItemConverter(
rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, eMapTo ));
m_aConverters.push_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize,
- C2U( "ReferenceDiagramSize" )));
+ C2U( "ReferencePageSize" )));
if( bDataSeries )
{
m_aConverters.push_back( new StatisticsItemConverter( xChartModel, rPropertySet, rItemPool ));
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 52c250b03d4f..593b523316e3 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: GraphicPropertyItemConverter.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -291,29 +291,6 @@ void GraphicPropertyItemConverter::FillSpecialItem(
}
break;
-// case XATTR_FILLBMP_POS:
-// case XATTR_FILLBMP_SIZEX:
-// case XATTR_FILLBMP_SIZEY:
-// case XATTR_FILLBMP_SIZELOG:
-// case XATTR_FILLBMP_TILEOFFSETX:
-// case XATTR_FILLBMP_TILEOFFSETY:
-// case XATTR_FILLBMP_STRETCH:
-// case XATTR_FILLBMP_POSOFFSETX:
-// case XATTR_FILLBMP_POSOFFSETY:
-// if( lcl_supportsFillProperties( m_eGraphicObjectType ))
-// {
- // avoid assertions while bitmap stuff is not working
-// try
-// {
-// FillBitmapItem( nWhichId, rOutItemSet );
-// }
-// catch( beans::UnknownPropertyException ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-// break;
-
case XATTR_FILLFLOATTRANSPARENCE:
try
{
@@ -544,30 +521,6 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
}
break;
-// case XATTR_FILLBMP_POS:
-// case XATTR_FILLBMP_SIZEX:
-// case XATTR_FILLBMP_SIZEY:
-// case XATTR_FILLBMP_SIZELOG:
-// case XATTR_FILLBMP_TILEOFFSETX:
-// case XATTR_FILLBMP_TILEOFFSETY:
-// case XATTR_FILLBMP_STRETCH:
-// case XATTR_FILLBMP_POSOFFSETX:
-// case XATTR_FILLBMP_POSOFFSETY:
-// if( lcl_supportsFillProperties( m_eGraphicObjectType ))
-// {
- // avoid assertions while bitmap stuff is not working
-// try
-// {
-// ApplyBitmapItem( nWhichId, rItemSet );
-// bChanged = true;
-// }
-// catch( beans::UnknownPropertyException ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-// break;
-
case XATTR_FILLFLOATTRANSPARENCE:
try
{
@@ -858,132 +811,5 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
return bChanged;
}
-void GraphicPropertyItemConverter::FillBitmapItem(
- USHORT nWhichId, SfxItemSet & rOutItemSet ) const
- throw( beans::UnknownPropertyException )
-{
- uno::Reference< beans::XPropertySet > xProp( GetPropertySet() );
- OSL_ASSERT( xProp.is());
- chart2::FillBitmap aBitmap;
- ( xProp->getPropertyValue( C2U( "Bitmap" ))) >>= aBitmap;
-
- switch( nWhichId )
- {
- // bitmap property
- case XATTR_FILLBITMAP:
- {
- XFillBitmapItem aBmpIt;
- aBmpIt.PutValue( uno::makeAny( aBitmap.aURL ), MID_GRAFURL );
- rOutItemSet.Put( aBmpIt );
- }
- break;
-
- case XATTR_FILLBMP_TILE:
- rOutItemSet.Put( XFillBmpTileItem(
- aBitmap.aBitmapMode == drawing::BitmapMode_REPEAT ));
- rOutItemSet.Put( XFillBmpStretchItem( FALSE ));
- break;
- case XATTR_FILLBMP_STRETCH:
- rOutItemSet.Put( XFillBmpStretchItem(
- aBitmap.aBitmapMode == drawing::BitmapMode_STRETCH ));
- rOutItemSet.Put( XFillBmpTileItem( FALSE ));
- break;
- case XATTR_FILLBMP_POS:
- break;
- case XATTR_FILLBMP_SIZEX:
- break;
- case XATTR_FILLBMP_SIZEY:
- break;
- case XATTR_FILLBMP_SIZELOG:
- break;
- case XATTR_FILLBMP_TILEOFFSETX:
- break;
- case XATTR_FILLBMP_TILEOFFSETY:
- break;
- case XATTR_FILLBMP_POSOFFSETX:
- break;
- case XATTR_FILLBMP_POSOFFSETY:
- break;
- }
-}
-
-void GraphicPropertyItemConverter::ApplyBitmapItem(
- USHORT nWhichId, const SfxItemSet & rItemSet )
- throw( beans::UnknownPropertyException )
-{
- static const ::rtl::OUString aBitmapPropName(
- RTL_CONSTASCII_USTRINGPARAM( "Bitmap" ));
- uno::Reference< beans::XPropertySet > xProp( GetPropertySet() );
- OSL_ASSERT( xProp.is());
- chart2::FillBitmap aBitmap;
- uno::Any aValue;
-
- try
- {
- ( xProp->getPropertyValue( aBitmapPropName )) >>= aBitmap;
-
- switch( nWhichId )
- {
- // bitmap property
- case XATTR_FILLBITMAP:
- {
- const XFillBitmapItem & rBitmapItem =
- static_cast< const XFillBitmapItem & >(
- rItemSet.Get( nWhichId ));
- rBitmapItem.QueryValue( aValue, MID_GRAFURL );
- aValue >>= aBitmap.aURL;
-
- // must remember bitmap, so that URL stays valid
- //ToDo: Never deleted yet !!!
-// GraphicObject * pTESTING_CACHE = new GraphicObject(
-// rBitmapItem.GetValue().GetGraphicObject() );
- }
- break;
-
- case XATTR_FILLBMP_TILE:
- case XATTR_FILLBMP_STRETCH:
- {
- const XFillBmpStretchItem & rStretchItem =
- static_cast< const XFillBmpStretchItem & >(
- rItemSet.Get( XATTR_FILLBMP_STRETCH ));
- const XFillBmpTileItem & rTileItem =
- static_cast< const XFillBmpTileItem & >(
- rItemSet.Get( XATTR_FILLBMP_TILE ));
-
- if( rTileItem.GetValue() != FALSE )
- aBitmap.aBitmapMode = drawing::BitmapMode_REPEAT;
- else if( rStretchItem.GetValue() != FALSE )
- aBitmap.aBitmapMode = drawing::BitmapMode_STRETCH;
- else
- aBitmap.aBitmapMode = drawing::BitmapMode_NO_REPEAT;
- }
- break;
-
- case XATTR_FILLBMP_POS:
- break;
- case XATTR_FILLBMP_SIZEX:
- break;
- case XATTR_FILLBMP_SIZEY:
- break;
- case XATTR_FILLBMP_SIZELOG:
- break;
- case XATTR_FILLBMP_TILEOFFSETX:
- break;
- case XATTR_FILLBMP_TILEOFFSETY:
- break;
- case XATTR_FILLBMP_POSOFFSETX:
- break;
- case XATTR_FILLBMP_POSOFFSETY:
- break;
- }
-
- xProp->setPropertyValue( aBitmapPropName, uno::makeAny( aBitmap ));
- }
- catch( beans::UnknownPropertyException ex )
- {
- ASSERT_EXCEPTION( ex );
- }
-}
-
} // namespace wrapper
} // namespace chart
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 6421429ef34c..e0a7b20bfa6f 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ItemConverter.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.24.1 $
*
* This file is part of OpenOffice.org.
*
@@ -88,11 +88,6 @@ SfxItemSet ItemConverter::CreateEmptyItemSet() const
return SfxItemSet( GetItemPool(), GetWhichPairs() );
}
-bool ItemConverter::IsValid() const
-{
- return m_bIsValid;
-}
-
uno::Reference< beans::XPropertySet > ItemConverter::GetPropertySet() const
{
return m_xPropertySet;
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 2303782263d9..8368e76baa82 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartController.cxx,v $
- * $Revision: 1.30 $
+ * $Revision: 1.30.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1050,11 +1050,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
else if(aCommand.equals("Cut"))
this->executeDispatch_Cut();
else if(aCommand.equals("DataRanges"))
- {
- //only test:
-// this->executeDispatch_ObjectToDefault();
this->executeDispatch_SourceData();
- }
//----------------------------------
else if(aCommand.equals("Update")) //Update Chart
{
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index d36325675fae..0b81df0a2367 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartController.hxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.12.44.3 $
*
* This file is part of OpenOffice.org.
*
@@ -584,7 +584,6 @@ private:
//private methods
sal_Bool impl_isDisposedOrSuspended() const;
- ::com::sun::star::awt::Size impl_getDiagramSize( sal_Int32 nDiaIndex = 0 ) const;
::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider() const;
void impl_adaptDataSeriesAutoResize();
@@ -597,7 +596,6 @@ private:
void SAL_CALL executeDlg_ObjectProperties( const ::rtl::OUString& rObjectCID );
void SAL_CALL executeDispatch_ChartType();
- void SAL_CALL executeDispatch_ObjectToDefault();
void SAL_CALL executeDispatch_InsertTitle();
void SAL_CALL executeDispatch_InsertLegend();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 7afa5fb32543..d847965b6022 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartController_Insert.cxx,v $
- * $Revision: 1.16 $
+ * $Revision: 1.16.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -45,7 +45,6 @@
#include "AxisHelper.hxx"
#include "TitleHelper.hxx"
#include "DiagramHelper.hxx"
-#include "ContextHelper.hxx"
#include "macros.hxx"
#include "chartview/DrawModelWrapper.hxx"
#include "chartview/NumberFormatterWrapper.hxx"
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index aa1a3bdc8e51..3b5b3d6fa7ba 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartController_Properties.cxx,v $
- * $Revision: 1.33 $
+ * $Revision: 1.33.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -67,10 +67,6 @@
//for auto_ptr
#include <memory>
-// for test in executeDispatch_ObjectToDefault
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-
// header for define RET_OK
#include <vcl/msgbox.hxx>
// for SolarMutex
@@ -167,7 +163,7 @@ namespace
{
::std::auto_ptr< awt::Size > pRefSize;
if( pRefSizeProvider.get() )
- pRefSize.reset( new awt::Size( pRefSizeProvider->getDiagramSize()));
+ pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
uno::Reference< beans::XPropertySet > xDiaProp;
xDiaProp.set( ChartModelHelper::findDiagram( xChartModel ), uno::UNO_QUERY );
@@ -200,7 +196,7 @@ namespace
{
::std::auto_ptr< awt::Size > pRefSize;
if( pRefSizeProvider.get() )
- pRefSize.reset( new awt::Size( pRefSizeProvider->getDiagramSize()));
+ pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
wrapper::GraphicPropertyItemConverter::eGraphicObjectType eMapTo =
wrapper::GraphicPropertyItemConverter::FILLED_DATA_POINT;
@@ -323,7 +319,7 @@ namespace
{
::std::auto_ptr< awt::Size > pRefSize;
if( pRefSizeProvider.get() )
- pRefSize.reset( new awt::Size( pRefSizeProvider->getDiagramSize()));
+ pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize()));
pItemConverter = new wrapper::AllAxisItemConverter( xChartModel, rDrawModel.GetItemPool(),
rDrawModel, uno::Reference< lang::XMultiServiceFactory >( xChartModel, uno::UNO_QUERY ), pRefSize );
@@ -663,50 +659,6 @@ void SAL_CALL ChartController::executeDlg_ObjectProperties( const ::rtl::OUStrin
}
}
-void SAL_CALL ChartController::executeDispatch_ObjectToDefault()
-{
- ::rtl::OUString aObjectCID(m_aSelection.getSelectedCID());
- if( !aObjectCID.getLength() )
- {
- DBG_ERROR("nothing is selected");
- return;
- }
-
- try
- {
- //-------------------------------------------------------------
- //get type of selected object
- ObjectType eObjectType = ObjectIdentifier::getObjectType( aObjectCID );
- if( OBJECTTYPE_UNKNOWN==eObjectType )
- {
- DBG_ERROR("unknown ObjectType");
- return;
- }
- //-------------------------------------------------------------
- //get properties of selected object
- uno::Reference< beans::XPropertySet > xObjectProperties = NULL;
- xObjectProperties = ObjectIdentifier::getObjectPropertySet( aObjectCID, getModel() );
- if(!xObjectProperties.is())
- return;
-
- uno::Sequence< beans::Property > aProps( xObjectProperties->getPropertySetInfo()->getProperties() );
- uno::Reference< beans::XPropertyState > xState( xObjectProperties, uno::UNO_QUERY );
-
- if( xState.is() )
- {
- for( sal_Int32 i = 0; i < aProps.getLength(); ++i )
- {
- if( aProps[i].Attributes & beans::PropertyAttribute::MAYBEDEFAULT )
- xState->setPropertyToDefault( aProps[i].Name );
- }
- }
- }
- catch( uno::Exception& e )
- {
- ASSERT_EXCEPTION( e );
- }
-}
-
void SAL_CALL ChartController::executeDispatch_View3D()
{
try
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 501f9c7cd92f..5db316196e1d 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartController_Tools.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.36.1 $
*
* This file is part of OpenOffice.org.
*
@@ -233,42 +233,12 @@ void lcl_InsertStringAsTextShapeIntoDrawPage(
namespace chart
{
-awt::Size ChartController::impl_getDiagramSize( sal_Int32 nDiaIndex ) const
-{
- awt::Size aResult;
-
- try
- {
- ExplicitValueProvider * pValueProvider(
- ExplicitValueProvider::getExplicitValueProvider( m_xChartView ));
- if( pValueProvider )
- {
- awt::Rectangle aRect( pValueProvider->getRectangleOfObject( ObjectIdentifier::createClassifiedIdentifier(
- OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32( nDiaIndex )))));
- aResult.Width = aRect.Width;
- aResult.Height = aRect.Height;
- }
- else
- {
- // fallback: page size
- aResult = ChartModelHelper::getPageSize( m_aModel->getModel() );
- }
- }
- catch( const uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
-
- return aResult;
-}
-
::std::auto_ptr< ReferenceSizeProvider > ChartController::impl_createReferenceSizeProvider() const
{
awt::Size aPageSize( ChartModelHelper::getPageSize( m_aModel->getModel()) );
return ::std::auto_ptr< ReferenceSizeProvider >(
- new ReferenceSizeProvider(
- aPageSize, impl_getDiagramSize(),
+ new ReferenceSizeProvider( aPageSize,
Reference< chart2::XChartDocument >( m_aModel->getModel(), uno::UNO_QUERY )));
}
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index ef3c5678c795..ce6db7db7bef 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartController_Window.cxx,v $
- * $Revision: 1.32 $
+ * $Revision: 1.31.24.2 $
*
* This file is part of OpenOffice.org.
*
@@ -1328,16 +1328,14 @@ bool ChartController::impl_moveOrResizeObject(
if( bNeedResize )
eActionType = ActionDescriptionProvider::RESIZE;
- UndoGuard aUndoGuard(
- ActionDescriptionProvider::createDescription(
- eActionType,
- ObjectNameProvider::getName( ObjectIdentifier::getObjectType( rCID ))),
- m_xUndoManager, xChartModel );
+ ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID );
+ UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
+ eActionType, ObjectNameProvider::getName( eObjectType )), m_xUndoManager, xChartModel );
{
ControllerLockGuard aCLGuard( xChartModel );
if( bNeedShift )
xObjProp->setPropertyValue( C2U("RelativePosition"), uno::makeAny( aRelPos ));
- if( bNeedResize )
+ if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also set an explicat size at the diagram when an explicit position is set
xObjProp->setPropertyValue( C2U("RelativeSize"), uno::makeAny( aRelSize ));
}
aUndoGuard.commitAction();
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 223dc701a984..4dcf766c7d7e 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: CachedDataSequence.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -107,24 +107,6 @@ public:
virtual ~CachedDataSequence();
- /** optimizes internal storage such that getData() is the fastest method for
- retrieving data.
- */
- void PreferMixedData();
- /** optimizes internal storage such that getNumericalData() is the fastest
- method for retrieving data.
- */
- void PreferNumericalData();
- /** optimizes internal storage such that getTextualData() is the fastest
- method for retrieving data.
- */
- void PreferTextualData();
-
- /** Allows setting the source-identifier. This should only be called once.
- (Late initialization)
- */
-// void SetSourceIdentifier( const ::rtl::OUString & aId );
-
/// establish methods for factory instatiation
APPHELPER_SERVICE_FACTORY_HELPER( CachedDataSequence )
/// declare XServiceInfo methods
@@ -181,8 +163,6 @@ protected:
virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments)
throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception);
- void fireModifyEvent();
-
// <properties>
sal_Int32 m_nNumberFormatKey;
::rtl::OUString m_sRole;
@@ -202,28 +182,16 @@ protected:
*/
void registerProperties();
- /** is used by interface method getNumericalData() as well as
- PreferNumericalData().
+ /** is used by interface method getNumericalData().
*/
::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const;
- /** is used by interface method getTextualData() as well as
- PreferTextualData().
+ /** is used by interface method getTextualData().
*/
::com::sun::star::uno::Sequence< ::rtl::OUString > Impl_getTextualData() const;
- /** is used by interface method getData() as well as PreferMixedData().
+ /** is used by interface method getData().
*/
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const;
- /** is used by PreferNumericalData().
- */
- void Impl_setNumericalData( const ::com::sun::star::uno::Sequence< double > & rSeq );
- /** is used by PreferTextualData().
- */
- void Impl_setTextualData( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rSeq );
- /** is used by PreferMixedData().
- */
- void Impl_setMixedData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & rSeq );
-
private:
enum DataType m_eCurrentDataType;
diff --git a/chart2/source/inc/ChartDebugTrace.hxx b/chart2/source/inc/ChartDebugTrace.hxx
index 64c01a6b1e65..4c7b306410c2 100644
--- a/chart2/source/inc/ChartDebugTrace.hxx
+++ b/chart2/source/inc/ChartDebugTrace.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartDebugTrace.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -40,6 +40,7 @@ namespace chart
namespace debug
{
+#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
/** Does several OSL_TRACEs that show information about the given chart document
(e.g. the chart-type manager, diagrams etc.)
@@ -61,6 +62,7 @@ void ChartDebugTraceDiagram(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram,
int nIndent = 0 );
+#endif
} // namespace debug
} // namespace chart
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index 28ecbd313944..4ceadbc8401d 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: CommonConverters.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -83,8 +83,6 @@ com::sun::star::drawing::HomogenMatrix
com::sun::star::drawing::HomogenMatrix3
B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMatrix& rM );
-::basegfx::B2DHomMatrix HomogenMatrix3ToB2DHomMatrix( const com::sun::star::drawing::HomogenMatrix3& rHM );
-
//-----------------------------------------------------------------------------
/** Position3D -> B3DPoint
*/
@@ -96,11 +94,6 @@ com::sun::star::drawing::HomogenMatrix3
com::sun::star::drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector);
//-----------------------------------------------------------------------------
-/** B3DVector -> Position3D
-*/
-com::sun::star::drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rVector);
-
-//-----------------------------------------------------------------------------
/** B3DPoint -> Position3D
*/
com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint);
@@ -111,13 +104,6 @@ com::sun::star::drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPo
::basegfx::B3DPoint Direction3DToB3DPoint( const com::sun::star::drawing::Direction3D& rDirection);
//-----------------------------------------------------------------------------
-/** two drawing::Position3D -> PolyPolygonShape3D
-*/
-::com::sun::star::drawing::PolyPolygonShape3D
- MakeLine3D( const ::com::sun::star::drawing::Position3D & rStart,
- const ::com::sun::star::drawing::Position3D & rEnd );
-
-//-----------------------------------------------------------------------------
/** PolyPolygonShape3D + drawing::Position3D -> PolyPolygonShape3D
*/
void AddPointToPoly( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly
@@ -144,12 +130,6 @@ com::sun::star::drawing::PolyPolygonShape3D BezierToPoly(
const com::sun::star::drawing::PolyPolygonBezierCoords& rBezier );
//-----------------------------------------------------------------------------
-/** drawing::PointSequenceSequence (2D) -> PolyPolygonShape3D
-*/
-com::sun::star::drawing::PolyPolygonShape3D PointSequenceToPoly(
- const com::sun::star::drawing::PointSequenceSequence& rPointSequence );
-
-//-----------------------------------------------------------------------------
/** PolyPolygonShape3D -> drawing::PointSequenceSequence (2D)
*/
com::sun::star::drawing::PointSequenceSequence PolyToPointSequence(
@@ -162,19 +142,6 @@ void appendPointSequence( com::sun::star::drawing::PointSequenceSequence& rTarge
, com::sun::star::drawing::PointSequenceSequence& rAdd );
//-----------------------------------------------------------------------------
-/** PolyPolygonShape3D -> Polygon (2D,integer!)
-*/
-Polygon PolyToToolsPoly(
- const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon );
-
-//-----------------------------------------------------------------------------
-/** tools Polygon (2D,integer!) -> PolyPolygonShape3D
-*/
-com::sun::star::drawing::PolyPolygonShape3D ToolsPolyToPoly(
- const Polygon& rToolsPoly, double zValue );
-
-
-//-----------------------------------------------------------------------------
/** Position3D + Direction3D == Position3D
*/
com::sun::star::drawing::Position3D
@@ -237,11 +204,6 @@ bool operator==( const com::sun::star::drawing::Position3D& rPos1
::com::sun::star::awt::Size Direction3DToAWTSize( const com::sun::star::drawing::Direction3D& rDirection );
//-----------------------------------------------------------------------------
-/** Sequence<double> -> B3DPoint
-*/
-::basegfx::B3DPoint SequenceToB3DPoint( const com::sun::star::uno::Sequence< double >& rSeq );
-
-//-----------------------------------------------------------------------------
/** B3DPoint -> Sequence<double>
*/
com::sun::star::uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint );
@@ -260,19 +222,6 @@ com::sun::star::uno::Sequence< double >
Position3DToSequence( const com::sun::star::drawing::Position3D& rPosition );
//-----------------------------------------------------------------------------
-/** Sequence<double> -> drawing::Direction3D
-*/
-com::sun::star::drawing::Direction3D
- SequenceToDirection3D( const com::sun::star::uno::Sequence< double >& rSeq );
-
-//-----------------------------------------------------------------------------
-/** drawing::Direction3D -> Sequence<double>
-*/
-
-com::sun::star::uno::Sequence< double >
- Direction3DToSequence( const com::sun::star::drawing::Direction3D& rDirection );
-
-//-----------------------------------------------------------------------------
/** drawing::Direction3D / double
*/
@@ -280,12 +229,6 @@ com::sun::star::drawing::Direction3D
operator/( const com::sun::star::drawing::Direction3D& rDirection, double f );
//-----------------------------------------------------------------------------
-/** text::WritingMode2 -> text::WritingMode
-*/
-
-com::sun::star::text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWritingMode );
-
-//-----------------------------------------------------------------------------
/** chart2::XDataSequence -> uno::Sequence< double >
*/
diff --git a/chart2/source/inc/ContextHelper.hxx b/chart2/source/inc/ContextHelper.hxx
index dc322eafcf62..e69de29bb2d1 100644
--- a/chart2/source/inc/ContextHelper.hxx
+++ b/chart2/source/inc/ContextHelper.hxx
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ContextHelper.hxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_CONTEXTHELPER_HXX
-#define CHART_CONTEXTHELPER_HXX
-
-#include <comphelper/InlineContainer.hxx>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <rtl/ustring.hxx>
-
-#include <map>
-
-namespace chart
-{
-
-namespace ContextHelper
-{
-
-typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any >
- tContextEntryMapType;
-typedef ::comphelper::MakeMap< ::rtl::OUString, ::com::sun::star::uno::Any >
- MakeContextEntryMap;
-
-/** creates a component context containing the properties given in the map.
-
- @param rDelegateContext
- delegation to further context
- */
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- createContext( const tContextEntryMapType & rMap,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & rDelegateContext =
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() );
-
-} // namespace ContextHelper
-
-} // namespace chart
-
-// CHART_CONTEXTHELPER_HXX
-#endif
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index ae023328fb37..262217a743e6 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSeriesHelper.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.24.1 $
*
* This file is part of OpenOffice.org.
*
@@ -52,11 +52,6 @@ namespace DataSeriesHelper
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence );
-void SetRole(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence,
- const ::rtl::OUString& rRole );
-
/** Retrieves the data sequence in the given data source that matches the
given role. If more than one sequences match the role, the first match
is returned. If no sequence matches, an empty reference is returned.
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index f906c6db562b..555bbad847c4 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSource.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -55,17 +55,6 @@ public:
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > > & rSequences );
- explicit DataSource(
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XDataSequence > > & rSequences );
- explicit DataSource(
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XDataSequence > > & rSequences,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XDataSequence > > & rLabel );
virtual ~DataSource();
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index cc6a4ff31ede..289628efcecc 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSourceHelper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -133,13 +133,6 @@ public:
static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSource > & xSource );
-
- static bool migrateData(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xChartDoc,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XDataProvider > & xNewDataProvider );
-
};
//.............................................................................
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 7fc3fb2edbbf..95aa249e84c9 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DiagramHelper.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.9.22.2 $
*
* This file is part of OpenOffice.org.
*
@@ -191,14 +191,6 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xSeries );
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XCoordinateSystem >
- getCoordinateSystemOfChartType(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDiagram >& xDiagram,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartType >& xChartType );
-
static ::std::vector<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > >
@@ -308,12 +300,6 @@ public:
::com::sun::star::chart2::XDataSeries >& xGivenDataSeries,
bool bForward );
- static sal_Int32 getIndexOfSeriesWithinChartType(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries >& xDataSeries,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartType >& xChartType );
-
static bool isSupportingFloorAndWall( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram );
diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx
index af8ed49beb14..4dd7ed7febe5 100644
--- a/chart2/source/inc/FastPropertyIdRanges.hxx
+++ b/chart2/source/inc/FastPropertyIdRanges.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: FastPropertyIdRanges.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -49,7 +49,9 @@ enum FastPropertyIdRanges
FAST_PROPERTY_ID_START_CHART_SYMBOL_PROP = FAST_PROPERTY_ID_START + 13000,
FAST_PROPERTY_ID_START_CHART_DATACAPTION_PROP = FAST_PROPERTY_ID_START + 14000,
FAST_PROPERTY_ID_START_CHART_SPLINE_PROP = FAST_PROPERTY_ID_START + 15000,
- FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000
+ FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000,
+ FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP = FAST_PROPERTY_ID_START + 17000,
+ FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000
};
} // namespace chart
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index 6ad99d1b5663..3eba45bd2df9 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: LabeledDataSequence.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -104,8 +104,6 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
throw (::com::sun::star::uno::RuntimeException);
- void fireModifyEvent();
-
private:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xLabel;
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 2fd0997b26fa..4b8698fc7fc4 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: MediaDescriptorHelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -63,8 +63,6 @@ public:
virtual ~MediaDescriptorHelper();
::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue > getAll();
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > getReducedForModel();
public:
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index fe49052ae2a4..f5dbb370560b 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ModifyListenerHelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -126,36 +126,6 @@ private:
// ================================================================================
-class ModifyListenerOnDemmandRefresh :
- public ::cppu::WeakImplHelper1<
- ::com::sun::star::util::XModifyListener >
-{
-public:
- explicit ModifyListenerOnDemmandRefresh( ::osl::Mutex & rMutex );
-
- void listenAtDocument( const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xChartDoc );
-
- void update();
- bool needsUpdate() const;
-
- // ____ XModifyListener ____
- virtual void SAL_CALL modified(
- const ::com::sun::star::lang::EventObject& aEvent )
- throw (::com::sun::star::uno::RuntimeException);
-
- // ____ XEventListener (base of XModifyListener) ____
- virtual void SAL_CALL disposing(
- const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException);
-
-private:
- ::osl::Mutex & m_rMutex;
- bool m_bNeedsUpdate;
-};
-
-// ================================================================================
-
namespace impl
{
diff --git a/chart2/source/inc/OEnumeration.hxx b/chart2/source/inc/OEnumeration.hxx
index 2ae7b42e2a43..e69de29bb2d1 100644
--- a/chart2/source/inc/OEnumeration.hxx
+++ b/chart2/source/inc/OEnumeration.hxx
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OEnumeration.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_OENUMERATION_HXX
-#define CHART_OENUMERATION_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/container/XEnumeration.hpp>
-
-#include <vector>
-
-namespace comphelper
-{
-
-class OEnumeration :
- public ::cppu::WeakImplHelper1<
- ::com::sun::star::container::XEnumeration >
-{
-public:
- OEnumeration( const ::std::vector< ::com::sun::star::uno::Any > & rContainer );
- virtual ~OEnumeration();
-
-protected:
- // ____ XEnumeration ____
- virtual sal_Bool SAL_CALL hasMoreElements()
- throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
-private:
- ::std::vector< ::com::sun::star::uno::Any > m_aContainer;
- ::std::vector< ::com::sun::star::uno::Any >::const_iterator m_aIter;
-};
-
-} // namespace comphelper
-
-// CHART_OENUMERATION_HXX
-#endif
diff --git a/chart2/source/inc/OIndexContainer.hxx b/chart2/source/inc/OIndexContainer.hxx
index 60fc2bc273f3..e69de29bb2d1 100644
--- a/chart2/source/inc/OIndexContainer.hxx
+++ b/chart2/source/inc/OIndexContainer.hxx
@@ -1,110 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OIndexContainer.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_OINDEXCONTAINER_HXX
-#define CHART_OINDEXCONTAINER_HXX
-
-#include <cppuhelper/implbase1.hxx>
-#include <osl/mutex.hxx>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-
-#include <vector>
-
-namespace comphelper
-{
-
-class OIndexContainer :
- public ::com::sun::star::container::XIndexContainer
-{
-public:
- explicit OIndexContainer( ::osl::Mutex & rMutex );
- virtual ~OIndexContainer();
-
- ::osl::Mutex & GetMutex();
-
- // ____ XInterface ____
- virtual ::com::sun::star::uno::Any SAL_CALL
- queryInterface( const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException);
-
-protected:
- /// implemented as a standard-library vector
- typedef ::std::vector< ::com::sun::star::uno::Any > tHelperContainerType;
-
- /// allows direct standard-library access to the container
- tHelperContainerType m_aContainer;
-
- // you have to implement this in derived classes
- // ____ XElementAccess ____
-// virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-// throw (::com::sun::star::uno::RuntimeException) = 0;
-
- // implemented by this class
- // =========================
-
- // ____ XIndexContainer ____
- virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeByIndex( sal_Int32 Index )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
- // ____ XIndexReplace ____
- virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
- // ____ XIndexAccess ____
- virtual sal_Int32 SAL_CALL getCount()
- throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
- // ____ XElementAccess ____
- virtual sal_Bool SAL_CALL hasElements()
- throw (::com::sun::star::uno::RuntimeException);
-
-private:
- ::osl::Mutex & m_rMutex;
-};
-
-} // namespace comphelper
-
-// CHART_OINDEXCONTAINER_HXX
-#endif
diff --git a/chart2/source/inc/OStyle.hxx b/chart2/source/inc/OStyle.hxx
index c1bb32f7ca44..e69de29bb2d1 100644
--- a/chart2/source/inc/OStyle.hxx
+++ b/chart2/source/inc/OStyle.hxx
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OStyle.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_OSTYLE_HXX
-#define CHART_OSTYLE_HXX
-
-#include "OPropertySet.hxx"
-#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-
-namespace property
-{
-
-class OStyle :
- public OPropertySet,
- public ::com::sun::star::style::XStyle
-{
-public:
- OStyle( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess > &xStyleFamily,
- ::osl::Mutex & rMutex );
- virtual ~OStyle();
-
- ::osl::Mutex & GetMutex();
-
-// inline SAL_CALL operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > () throw ()
-// { return static_cast< ::cppu::OWeakObject * >( this ); }
-
-protected:
-
- // ____ XStyle ____
- virtual sal_Bool SAL_CALL isUserDefined()
- throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isInUse()
- throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getParentStyle()
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException);
-
- // ____ XNamed (base of XStyle) ____
- virtual ::rtl::OUString SAL_CALL getName()
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName )
- throw (::com::sun::star::uno::RuntimeException);
-
- // necessary overloads from OPropertySet
-
- // ____ XInterface ____
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
- throw (::com::sun::star::uno::RuntimeException);
-// virtual void SAL_CALL acquire() throw ();
-// virtual void SAL_CALL release() throw ();
-
- // ____ XServiceInfo ____
-// virtual ::rtl::OUString SAL_CALL
-// getImplementationName()
-// throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL
-// supportsService( const ::rtl::OUString& ServiceName )
-// throw (::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-// getSupportedServiceNames()
-// throw (::com::sun::star::uno::RuntimeException);
-
- // ____ XTypeProvider ____
-// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
-// getTypes()
-// throw (::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
-// getImplementationId()
-// throw (::com::sun::star::uno::RuntimeException);
-
-private:
- ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess > m_xStyleFamily;
-
- ::rtl::OUString m_aName;
- ::rtl::OUString m_aParentStyleName;
- sal_Bool m_bUserDefined;
-
- ::osl::Mutex & m_rMutex;
-};
-
-} // namespace property
-
-// CHART_OSTYLE_HXX
-#endif
-
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index dc90d58e914b..a5dc0429297c 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ObjectIdentifier.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -101,8 +101,6 @@ class ObjectIdentifier
//where Type: getStringForType( ObjectType eType ) or other string
public:
- ObjectIdentifier();
-
static rtl::OUString createClassifiedIdentifierForObject(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xObject
@@ -144,12 +142,6 @@ public:
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString createParticleForChartType(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartType >& xChartType
- , const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XModel >& xChartModel );
-
static rtl::OUString createParticleForAxis(
sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx
index 54456c11fb64..4951743c3b61 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ReferenceSizeProvider.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -57,20 +57,12 @@ public:
AUTO_RESIZE_UNKNOWN
};
- enum ReferenceSizeType
- {
- REF_PAGE,
- REF_DIAGRAM
- };
-
ReferenceSizeProvider(
::com::sun::star::awt::Size aPageSize,
- ::com::sun::star::awt::Size aDiagramSize,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDoc );
::com::sun::star::awt::Size getPageSize() const;
- ::com::sun::star::awt::Size getDiagramSize() const;
bool useAutoScale() const;
/** Retrieves the state auto-resize from all objects that support this
@@ -102,17 +94,13 @@ public:
*/
void setAutoResizeState( AutoResizeState eNewState );
-
-
/** Sets the ReferencePageSize according to the internal settings of this
class at the XPropertySet, and the adapted font sizes if bAdaptFontSizes
- is </TRUE>. The type determines whether the diagram or the page is used
- for reference.
+ is </TRUE>.
*/
void setValuesAtPropertySet(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xProp,
- ReferenceSizeType eType,
bool bAdaptFontSizes = true );
/** Sets the ReferencePageSize according to the internal settings of this
@@ -125,8 +113,7 @@ public:
/** Sets the internal value at all data series in the currently set model.
This is useful, if you have changed a chart-type and thus probably added
- some new data series via model functionality (which does not know the
- diagram size).
+ some new data series via model functionality.
*/
void setValuesAtAllDataSeries();
@@ -140,7 +127,6 @@ public:
static void getAutoResizeFromPropSet(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xProp,
- ReferenceSizeType eType,
AutoResizeState & rInOutState );
/** calls getAutoResizeFromPropSet with the title's property set
@@ -160,7 +146,6 @@ private:
AutoResizeState & rInOutState );
::com::sun::star::awt::Size m_aPageSize;
- ::com::sun::star::awt::Size m_aDiagramSize;
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > m_xChartDoc;
bool m_bUseAutoScale;
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 79c0a0c07fd9..73317572236c 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: RegressionCurveHelper.hxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -165,11 +165,6 @@ public:
// ------------------------------------------------------------
- /// returns a calculator object for mean-value lines (used by the view)
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveCalculator >
- createMeanValueLineCalculator();
-
/// returns a calculator object for regression curves (used by the view)
static ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XRegressionCurveCalculator >
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index ef47fa422c86..936e6e4ab4cf 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: WeakListenerAdapter.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -98,8 +98,6 @@ class WeakModifyListenerAdapter :
{
public:
explicit WeakModifyListenerAdapter(
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > & xListener );
- explicit WeakModifyListenerAdapter(
const ::com::sun::star::uno::WeakReference< ::com::sun::star::util::XModifyListener > & xListener );
virtual ~WeakModifyListenerAdapter();
@@ -117,8 +115,6 @@ class WeakSelectionChangeListenerAdapter :
public:
explicit WeakSelectionChangeListenerAdapter(
const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener );
- explicit WeakSelectionChangeListenerAdapter(
- const ::com::sun::star::uno::WeakReference< ::com::sun::star::view::XSelectionChangeListener > & xListener );
virtual ~WeakSelectionChangeListenerAdapter();
protected:
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 23ddca726e0d..9e933a099109 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: macros.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -47,7 +47,7 @@
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr())
#else
//avoid compilation warnings
-#define ASSERT_EXCEPTION(ex) (void)(ex);
+#define ASSERT_EXCEPTION(ex) (void)(ex)
#endif
#define U2C(ouString) (::rtl::OUStringToOString(ouString,RTL_TEXTENCODING_ASCII_US).getStr())
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index f499d0ec1f27..e25cb92d4012 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: XMLFilter.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -33,7 +33,6 @@
#include "XMLFilter.hxx"
#include "macros.hxx"
-#include "ContextHelper.hxx"
#include "MediaDescriptorHelper.hxx"
#include "ContainerHelper.hxx"
#include <comphelper/mediadescriptor.hxx>
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 5595606a8557..08e30b1ef561 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Axis.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -160,7 +160,7 @@ void lcl_AddPropertiesToVector(
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
- Property( C2U( "ReferenceDiagramSize" ),
+ Property( C2U( "ReferencePageSize" ),
PROP_AXIS_REFERENCE_DIAGRAM_SIZE,
::getCppuType( reinterpret_cast< const awt::Size * >(0)),
beans::PropertyAttribute::BOUND
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 7d3c7396874e..49551bf78c7c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartModel.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.8.2 $
*
* This file is part of OpenOffice.org.
*
@@ -81,46 +81,6 @@ const OUString lcl_aGDIMetaFileMIMEType(
const OUString lcl_aGDIMetaFileMIMETypeHighContrast(
RTL_CONSTASCII_USTRINGPARAM("application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\""));
-Reference< chart2::data::XDataProvider > lcl_getDataProviderFromParent(
- const Reference< frame::XModel > & xParent )
-{
- Reference< chart2::data::XDataProvider > xResult;
- const OUString aDataProviderServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider"));
- Reference< lang::XMultiServiceFactory > xFact( xParent, uno::UNO_QUERY );
- if( xFact.is())
- {
- uno::Sequence< OUString > aServiceNames( xFact->getAvailableServiceNames());
- const OUString * pBegin = aServiceNames.getConstArray();
- const OUString * pEnd = pBegin + aServiceNames.getLength();
- if( ::std::find( pBegin, pEnd, aDataProviderServiceName ) != pEnd )
- {
- xResult.set(
- xFact->createInstance( aDataProviderServiceName ), uno::UNO_QUERY );
- }
- }
- return xResult;
-}
-
-bool lcl_ParentIsTempDocument(
- const Reference< uno::XInterface > & xParent )
-{
- bool bResult = false;
- try
- {
- Reference< beans::XPropertySet > xDocProp( xParent, uno::UNO_QUERY );
- if( xDocProp.is())
- xDocProp->getPropertyValue( C2U("InternalDocument")) >>= bResult;
- }
- catch( const beans::UnknownPropertyException & )
- {}
- catch( const uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
-
- return bResult;
-}
-
} // anonymous namespace
//-----------------------------------------------------------------
@@ -664,108 +624,6 @@ uno::Reference< document::XDocumentProperties > SAL_CALL
return m_xDocumentProperties;
}
-/*
-//-----------------------------------------------------------------
-// view::XPrintable (optional interface)
-//-----------------------------------------------------------------
- uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel
-::getPrinter() throw(uno::RuntimeException)
-{
- //@todo guard
- return m_aPrinterOptions;
-}
-
- void SAL_CALL ChartModel
-::setPrinter( const uno::Sequence< beans::PropertyValue >& rPrinter )
- throw(lang::IllegalArgumentException, uno::RuntimeException)
-{
- //@todo guard
- m_aPrinterOptions = rPrinter;
-}
-
- void SAL_CALL ChartModel
-::print( const uno::Sequence< beans::PropertyValue >& rOptions )
- throw(lang::IllegalArgumentException, uno::RuntimeException)
-{
- //@todo
-}
-
-//-----------------------------------------------------------------
-// document::XEventBroadcaster (optional interface)
-//-----------------------------------------------------------------
-
- void SAL_CALL ChartModel
-::addEventListener( const uno::Reference< document::XEventListener >& xListener )
- throw(uno::RuntimeException)
-{
- //@todo
-}
-
- void SAL_CALL ChartModel
-::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
- throw(uno::RuntimeException)
-{
- //@todo
-}
-
-//-----------------------------------------------------------------
-// document::XEventsSupplier (optional interface)
-//-----------------------------------------------------------------
-
- uno::Reference< container::XNameReplace > SAL_CALL ChartModel
-::getEvents() throw(uno::RuntimeException)
-{
- //@todo
-}
-
-//-----------------------------------------------------------------
-// document::XViewDataSupplier (optional interface)
-//-----------------------------------------------------------------
-
- uno::Reference< container::XIndexAccess > SAL_CALL ChartModel
-::getViewData() throw(uno::RuntimeException)
-{
- //@todo
-}
-
- void SAL_CALL ChartModel
-::setViewData( const uno::Reference< container::XIndexAccess >& xData )
- throw(uno::RuntimeException)
-{
- //m_bModified = sal_True;//@todo? is this really correct
- //@todo
-}
-*/
-
-//-----------------------------------------------------------------
-// ::com::sun::star::style::XStyleFamiliesSupplier
-//-----------------------------------------------------------------
-// ::com::sun::star::uno::Reference<
-// ::com::sun::star::container::XNameAccess > SAL_CALL ChartModel
-// ::getStyleFamilies()
-// throw (uno::RuntimeException)
-// {
-// OSL_ASSERT( m_pImplChartModel.get() != 0 );
-// // /--
-// MutexGuard aGuard( m_aModelMutex );
-// return m_pImplChartModel->GetStyleFamilies();
-// // \--
-// }
-
-//-----------------------------------------------------------------
-// chart2::XModelDataProvider
-//-----------------------------------------------------------------
-// Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartModel
-// ::getDataSeries()
-// throw (uno::RuntimeException)
-// {
-// OSL_ASSERT( m_pImplChartModel.get() != 0 );
-// // /--
-// MutexGuard aGuard( m_aModelMutex );
-// return m_pImplChartModel->GetDataSeries();
-// // \--
-// }
-
//-----------------------------------------------------------------
// chart2::XChartDocument
//-----------------------------------------------------------------
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 339f754ec04b..bee4332a857c 100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartModel.hxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.8.2 $
*
* This file is part of OpenOffice.org.
*
@@ -37,11 +37,7 @@
#include <com/sun/star/frame/XStorable2.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/view/XPrintable.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -97,18 +93,12 @@ typedef ::comphelper::WeakImplHelper20<
,::com::sun::star::frame::XStorable2 //(extension of XStorable)
// ,::com::sun::star::frame::XStorable //(required interface) base of XStorable2
,::com::sun::star::util::XModifiable //comprehends XModifyBroadcaster (required interface)
-// ,::com::sun::star::view::XPrintable //(optional interface)
-// ,::com::sun::star::document::XEventBroadcaster //(optional interface)
-// ,::com::sun::star::document::XEventsSupplier //(optional interface)
-// ,::com::sun::star::document::XViewDataSupplier //(optional interface)
// ,::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface)
// ,::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface)
// ,::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper
,::com::sun::star::lang::XServiceInfo
-// ,::com::sun::star::chart2::XModelDataProvider
,::com::sun::star::chart2::XChartDocument // derived from XModel
,::com::sun::star::chart2::data::XDataReceiver // public API
-// ,::com::sun::star::style::XStyleFamiliesSupplier
,::com::sun::star::chart2::XTitled
,::com::sun::star::frame::XLoadable
,::com::sun::star::util::XCloneable
@@ -402,74 +392,6 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL
getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException);
-/*
- //-----------------------------------------------------------------
- // ::com::sun::star::view::XPrintable (optional interface)
- //-----------------------------------------------------------------
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
- getPrinter() throw (::com::sun::star::uno::RuntimeException);
-
- virtual void SAL_CALL
- setPrinter( const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue >& rPrinter )
- throw (::com::sun::star::lang::IllegalArgumentException
- , ::com::sun::star::uno::RuntimeException);
-
- virtual void SAL_CALL
- print( const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue >& rOptions )
- throw (::com::sun::star::lang::IllegalArgumentException
- , ::com::sun::star::uno::RuntimeException);
-
- //-----------------------------------------------------------------
- // ::com::sun::star::document::XEventBroadcaster (optional interface)
- //-----------------------------------------------------------------
-
- virtual void SAL_CALL
- addEventListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException);
-
- virtual void SAL_CALL
- removeEventListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException);
-
- //-----------------------------------------------------------------
- // ::com::sun::star::document::XEventsSupplier (optional interface)
- //-----------------------------------------------------------------
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL
- getEvents() throw (::com::sun::star::uno::RuntimeException);
-
- //-----------------------------------------------------------------
- // ::com::sun::star::document::XViewDataSupplier (optional interface)
- //-----------------------------------------------------------------
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL
- getViewData() throw (::com::sun::star::uno::RuntimeException);
-
- virtual void SAL_CALL
- setViewData( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XIndexAccess >& xData )
- throw (::com::sun::star::uno::RuntimeException);
- */
-
- //-----------------------------------------------------------------
- // ::com::sun::star::style::XStyleFamiliesSupplier
- //-----------------------------------------------------------------
-// virtual ::com::sun::star::uno::Reference<
-// ::com::sun::star::container::XNameAccess > SAL_CALL
-// getStyleFamilies() throw (::com::sun::star::uno::RuntimeException);
-
- //-----------------------------------------------------------------
- // ::com::sun::star::chart2::XModelDataProvider
- //-----------------------------------------------------------------
-// virtual ::com::sun::star::uno::Sequence<
-// ::com::sun::star::uno::Reference<
-// ::com::sun::star::chart2::XDataSeries > > SAL_CALL
-// getDataSeries() throw (::com::sun::star::uno::RuntimeException);
-
//-----------------------------------------------------------------
// ::com::sun::star::chart2::XChartDocument
//-----------------------------------------------------------------
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 4f270e221725..57680c4c15e7 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataPoint.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -87,12 +87,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
namespace chart
{
-DataPoint::DataPoint() :
- ::property::OPropertySet( m_aMutex ),
- m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()),
- m_bNoParentPropAllowed( false )
-{}
-
DataPoint::DataPoint( const uno::Reference< beans::XPropertySet > & rParentProperties ) :
::property::OPropertySet( m_aMutex ),
m_xParentProperties( rParentProperties ),
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index b2ba60c0e900..7117276800df 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataPoint.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -65,7 +65,6 @@ class DataPoint :
public ::property::OPropertySet
{
public:
- DataPoint();
DataPoint( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rParentProperties );
virtual ~DataPoint();
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 9b46136d2980..8e80bc1e8a47 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataPointProperties.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -326,7 +326,7 @@ void DataPointProperties::AddPropertiesToVector(
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
- Property( C2U( "ReferenceDiagramSize" ),
+ Property( C2U( "ReferencePageSize" ),
PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE,
::getCppuType( reinterpret_cast< const awt::Size * >(0)),
beans::PropertyAttribute::BOUND
diff --git a/chart2/source/model/main/DataPointStyle.cxx b/chart2/source/model/main/DataPointStyle.cxx
index 3e4155e1646d..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataPointStyle.cxx
+++ b/chart2/source/model/main/DataPointStyle.cxx
@@ -1,174 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataPointStyle.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "DataPointStyle.hxx"
-#include "DataPointProperties.hxx"
-#include "PropertyHelper.hxx"
-#include "macros.hxx"
-#include "ContainerHelper.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <algorithm>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
-
-// ____________________________________________________________
-
-namespace
-{
-const uno::Sequence< Property > & lcl_GetPropertySequence()
-{
- static uno::Sequence< Property > aPropSeq;
-
- // /--
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if( 0 == aPropSeq.getLength() )
- {
- // get properties
- ::std::vector< ::com::sun::star::beans::Property > aProperties;
- ::chart::DataPointProperties::AddPropertiesToVector( aProperties );
-
- // and sort them for access via bsearch
- ::std::sort( aProperties.begin(), aProperties.end(),
- ::chart::PropertyNameLess() );
-
- // transfer result to static Sequence
- aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
- }
-
- return aPropSeq;
-}
-} // anonymous namespace
-
-// ____________________________________________________________
-
-namespace chart
-{
-
-DataPointStyle::DataPointStyle(
- const uno::Reference< container::XNameAccess > & xStyleFamily,
- ::osl::Mutex & par_rMutex ) :
- ::property::OStyle( xStyleFamily, par_rMutex ),
- m_rMutex( par_rMutex )
-{}
-
-DataPointStyle::~DataPointStyle()
-{}
-
-// ____ XInterface ____
-uno::Any SAL_CALL DataPointStyle::queryInterface(
- const uno::Type & rType )
- throw (uno::RuntimeException)
-{
- return ::cppu::OWeakObject::queryInterface( rType );
-}
-
-void SAL_CALL DataPointStyle::acquire() throw ()
-{
- ::cppu::OWeakObject::acquire();
-}
-
-void SAL_CALL DataPointStyle::release() throw ()
-{
- ::cppu::OWeakObject::release();
-}
-
-// ____ OPropertySet ____
-uno::Any DataPointStyle::GetDefaultValue( sal_Int32 nHandle ) const
- throw(beans::UnknownPropertyException)
-{
- static tPropertyValueMap aStaticDefaults;
-
- // /--
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if( 0 == aStaticDefaults.size() )
- {
- // initialize defaults
- DataPointProperties::AddDefaultsToMap( aStaticDefaults );
- }
-
- tPropertyValueMap::const_iterator aFound(
- aStaticDefaults.find( nHandle ));
-
- if( aFound == aStaticDefaults.end())
- throw beans::UnknownPropertyException();
-
- return (*aFound).second;
- // \--
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataPointStyle::getInfoHelper()
-{
- return getInfoHelperConst();
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataPointStyle::getInfoHelperConst() const
-{
- static ::cppu::OPropertyArrayHelper aArrayHelper(
- lcl_GetPropertySequence(),
- /* bSorted = */ sal_True );
-
- return aArrayHelper;
-}
-
-// ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
- DataPointStyle::getPropertySetInfo()
- throw (uno::RuntimeException)
-{
- static Reference< beans::XPropertySetInfo > xInfo;
-
- // /--
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if( !xInfo.is())
- {
- xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
- getInfoHelper());
- }
-
- return xInfo;
- // \--
-}
-
-::osl::Mutex & DataPointStyle::GetMutex()
-{
- return m_rMutex;
-}
-
-} // namespace chart
diff --git a/chart2/source/model/main/DataPointStyle.hxx b/chart2/source/model/main/DataPointStyle.hxx
index 6cf3638bbe86..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataPointStyle.hxx
+++ b/chart2/source/model/main/DataPointStyle.hxx
@@ -1,83 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataPointStyle.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_DATAPOINTSTYLE_HXX
-#define CHART_DATAPOINTSTYLE_HXX
-
-#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
-
-#include "OStyle.hxx"
-
-namespace chart
-{
-
-class DataPointStyle :
- public ::cppu::OWeakObject,
- public ::property::OStyle
-{
-public:
- DataPointStyle( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess > & xStyleFamily,
- ::osl::Mutex & rMutex );
- virtual ~DataPointStyle();
-
- // ____ XInterface ____
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type & rType )
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL acquire() throw ();
- virtual void SAL_CALL release() throw ();
-
-protected:
- // ____ OPropertySet ____
- virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(::com::sun::star::beans::UnknownPropertyException);
-
- virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
- // ____ XPropertySet ____
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException);
-
- ::osl::Mutex & GetMutex();
-
- /** const variant of getInfoHelper()
- */
- ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelperConst() const;
-
-private:
- ::osl::Mutex & m_rMutex;
-};
-
-} // namespace chart
-
-// CHART_DATAPOINTSTYLE_HXX
-#endif
diff --git a/chart2/source/model/main/DataSeriesStyle.cxx b/chart2/source/model/main/DataSeriesStyle.cxx
index 24799da9749e..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataSeriesStyle.cxx
+++ b/chart2/source/model/main/DataSeriesStyle.cxx
@@ -1,177 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataSeriesStyle.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "DataSeriesStyle.hxx"
-#include "DataSeriesProperties.hxx"
-#include "CharacterProperties.hxx"
-#include "PropertyHelper.hxx"
-#include "macros.hxx"
-#include "ContainerHelper.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <algorithm>
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::beans::Property;
-using ::osl::MutexGuard;
-
-// ____________________________________________________________
-
-namespace
-{
-const uno::Sequence< Property > & lcl_GetPropertySequence()
-{
- static uno::Sequence< Property > aPropSeq;
-
- // /--
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if( 0 == aPropSeq.getLength() )
- {
- // get properties
- ::std::vector< ::com::sun::star::beans::Property > aProperties;
- ::chart::DataSeriesProperties::AddPropertiesToVector( aProperties );
- ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
-
- // and sort them for access via bsearch
- ::std::sort( aProperties.begin(), aProperties.end(),
- ::chart::PropertyNameLess() );
-
- // transfer result to static Sequence
- aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
- }
-
- return aPropSeq;
-}
-} // anonymous namespace
-
-// ____________________________________________________________
-
-namespace chart
-{
-
-DataSeriesStyle::DataSeriesStyle(
- const uno::Reference< container::XNameAccess > & xStyleFamily,
- ::osl::Mutex & par_rMutex ) :
- ::property::OStyle( xStyleFamily, par_rMutex ),
- m_rMutex( par_rMutex )
-{}
-
-DataSeriesStyle::~DataSeriesStyle()
-{}
-
-// ____ XInterface ____
-uno::Any SAL_CALL DataSeriesStyle::queryInterface(
- const uno::Type & rType )
- throw (uno::RuntimeException)
-{
- return ::cppu::OWeakObject::queryInterface( rType );
-}
-
-void SAL_CALL DataSeriesStyle::acquire() throw ()
-{
- ::cppu::OWeakObject::acquire();
-}
-
-void SAL_CALL DataSeriesStyle::release() throw ()
-{
- ::cppu::OWeakObject::release();
-}
-
-// ____ OPropertySet ____
-uno::Any DataSeriesStyle::GetDefaultValue( sal_Int32 nHandle ) const
- throw(beans::UnknownPropertyException)
-{
- static tPropertyValueMap aStaticDefaults;
-
- // /--
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if( 0 == aStaticDefaults.size() )
- {
- // initialize defaults
- DataSeriesProperties::AddDefaultsToMap( aStaticDefaults );
- CharacterProperties::AddDefaultsToMap( aStaticDefaults );
- }
-
- tPropertyValueMap::const_iterator aFound(
- aStaticDefaults.find( nHandle ));
-
- if( aFound == aStaticDefaults.end())
- throw beans::UnknownPropertyException();
-
- return (*aFound).second;
- // \--
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataSeriesStyle::getInfoHelper()
-{
- return getInfoHelperConst();
-}
-
-::cppu::IPropertyArrayHelper & SAL_CALL DataSeriesStyle::getInfoHelperConst() const
-{
- static ::cppu::OPropertyArrayHelper aArrayHelper(
- lcl_GetPropertySequence(),
- /* bSorted = */ sal_True );
-
- return aArrayHelper;
-}
-
-// ____ XPropertySet ____
-Reference< beans::XPropertySetInfo > SAL_CALL
- DataSeriesStyle::getPropertySetInfo()
- throw (uno::RuntimeException)
-{
- static Reference< beans::XPropertySetInfo > xInfo;
-
- // /--
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if( !xInfo.is())
- {
- xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo(
- getInfoHelper());
- }
-
- return xInfo;
- // \--
-}
-
-::osl::Mutex & DataSeriesStyle::GetMutex()
-{
- return m_rMutex;
-}
-
-} // namespace chart
diff --git a/chart2/source/model/main/DataSeriesStyle.hxx b/chart2/source/model/main/DataSeriesStyle.hxx
index cd781016471f..e69de29bb2d1 100644
--- a/chart2/source/model/main/DataSeriesStyle.hxx
+++ b/chart2/source/model/main/DataSeriesStyle.hxx
@@ -1,83 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: DataSeriesStyle.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_DATASERIESSTYLE_HXX
-#define CHART_DATASERIESSTYLE_HXX
-
-#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
-
-#include "OStyle.hxx"
-
-namespace chart
-{
-
-class DataSeriesStyle :
- public ::cppu::OWeakObject,
- public ::property::OStyle
-{
-public:
- DataSeriesStyle( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess > & xStyleFamily,
- ::osl::Mutex & rMutex );
- virtual ~DataSeriesStyle();
-
- // ____ XInterface ____
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type & rType )
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL acquire() throw ();
- virtual void SAL_CALL release() throw ();
-
-protected:
- // ____ OPropertySet ____
- virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(::com::sun::star::beans::UnknownPropertyException);
-
- virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
- // ____ XPropertySet ____
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException);
-
- ::osl::Mutex & GetMutex();
-
- /** const variant of getInfoHelper()
- */
- ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelperConst() const;
-
-private:
- ::osl::Mutex & m_rMutex;
-};
-
-} // namespace chart
-
-// CHART_DATASERIESSTYLE_HXX
-#endif
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 3d2ae5875ed9..1718ddb1646d 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -8,7 +8,7 @@
*
* $RCSfile: Diagram.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.24.32.2 $
*
* This file is part of OpenOffice.org.
*
@@ -35,7 +35,6 @@
#include "macros.hxx"
#include "PropertyHelper.hxx"
#include "Wall.hxx"
-#include "ContextHelper.hxx"
#include "UserDefinedProperties.hxx"
#include "ConfigColorScheme.hxx"
#include "ContainerHelper.hxx"
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 56d0602e901b..a2175b68a1da 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: FormattedString.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -87,12 +87,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
namespace chart
{
-FormattedString::FormattedString( const ::rtl::OUString & rString ) :
- ::property::OPropertySet( m_aMutex ),
- m_aString( rString ),
- m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder())
-{}
-
FormattedString::FormattedString(
uno::Reference< uno::XComponentContext > const & /* xContext */ ) :
::property::OPropertySet( m_aMutex ),
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 66251ddebc58..de2c8adc40b5 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: FormattedString.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,7 +61,6 @@ class FormattedString :
public ::property::OPropertySet
{
public:
- FormattedString( const ::rtl::OUString & rString );
FormattedString( ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext );
virtual ~FormattedString();
diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx
index 73f267739f79..6360ccc7ee9c 100644
--- a/chart2/source/model/main/ImplChartModel.cxx
+++ b/chart2/source/model/main/ImplChartModel.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ImplChartModel.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,10 +32,7 @@
#include "precompiled_chart2.hxx"
#include "ImplChartModel.hxx"
#include "DataSeries.hxx"
-#include "StyleFamilies.hxx"
-#include "StyleFamily.hxx"
#include "macros.hxx"
-#include "ContextHelper.hxx"
#include "PageBackground.hxx"
#include "DiagramHelper.hxx"
#include "NameContainer.hxx"
@@ -164,93 +161,8 @@ ImplChartModel::ImplChartModel( const ImplChartModel & rOther, const Reference<
ImplChartModel::~ImplChartModel()
{}
-// ImplChartModel::CreateStyles()
-// {
-// // set style
-// Reference< container::XNameAccess > xGraphicsFamily(
-// GetStyleFamilies()->getByName( C2U( "graphics" )), uno::UNO_QUERY );
-
-// if( xGraphicsFamily.is())
-// const sal_Int32 nModul = Reference< container::XIndexAccess >(
-// xGraphicsFamily, uno::UNO_QUERY )->getCount();
-// for( size_t nI = 0; nI < nMaxSeries; ++nI )
-// {
-// try
-// {
-// Reference< ::com::sun::star::style::XStyle > xStyle(
-// xGraphicsFamily->getByName(
-// aStyleNameStub + OUString::valueOf(
-// static_cast< sal_Int32 >( (nI % nModul)+1 ))), uno::UNO_QUERY );
-
-// Reference< beans::XPropertySet > xSeriesProp(
-// aResult[ nI ], uno::UNO_QUERY );
-
-// if( xSeriesProp.is())
-// {
-// xSeriesProp->setPropertyValue(
-// C2U( "Color" ),
-// uno::makeAny( nDefaultColors[ sal_Int32( nI % nMaxDefaultColors ) ]));
-
-// // set style
-// Reference< ::com::sun::star::style::XStyleSupplier >
-// xStyleSupp( xSeriesProp->getPropertyValue( C2U( "FirstGraphicsFormat" )),
-// uno::UNO_QUERY );
-
-// if( xStyleSupp.is())
-// {
-// xStyleSupp->setStyle( xStyle );
-// }
-// }
-// }
-// catch( uno::Exception ex )
-// {
-// OSL_ENSURE( false, "Couldn't set style" );
-// }
-// }
-// }
-
-
Reference< container::XNameAccess > ImplChartModel::GetStyleFamilies()
{
- if( ! m_xFamilies.is())
- {
-// StyleFamilies * pStyleFamilies = new StyleFamilies();
-// StyleFamily * pGraphicsFamily = new StyleFamily();
-// Reference< container::XNameAccess > xGraphicsFamily( pGraphicsFamily );
-
- // add some default styles for graphics
-
- // randomly generated default colors
-
-// sal_Int32 i = 0;
-// const sal_Int32 nMax = sizeof( nDefaults ) / sizeof( sal_Int32 );
-// for( ; i < nMax; ++i )
-// {
-// try
-// {
-// Reference< ::com::sun::star::style::XStyle > xStyle(
-// new GraphicsPropertiesStyle( xGraphicsFamily ) );
-// xStyle->setName( C2U( "Series " ) + OUString::valueOf( static_cast< sal_Int32 >(i + 1) ) );
-// Reference< beans::XPropertySet > xProp( xStyle, uno::UNO_QUERY );
-// if( xProp.is())
-// {
-// xProp->setPropertyValue( C2U( "Color" ), uno::makeAny( nDefaults[ i ] ));
-// }
-// pGraphicsFamily->AddStyle( xStyle );
-// }
-// catch( uno::Exception ex )
-// {
-// OSL_ENSURE( false, "Error on creating styles" );
-// }
-// }
-
-// bool bResult = pStyleFamilies->AddStyleFamily(
-// C2U( "graphics" ), xGraphicsFamily );
-
-// OSL_ASSERT( bResult );
-// m_xFamilies.set( pStyleFamilies );
- }
-
return m_xFamilies;
}
@@ -262,19 +174,6 @@ void ImplChartModel::RemoveAllDiagrams()
m_aDiagrams.clear();
}
-bool ImplChartModel::RemoveDiagram( const Reference< chart2::XDiagram > & xDiagram )
-{
- tDiagramContainer::iterator aIt( ::std::find(
- m_aDiagrams.begin(), m_aDiagrams.end(),
- xDiagram ));
- if( aIt == m_aDiagrams.end() )
- return false;
-
- ModifyListenerHelper::removeListener( *aIt, m_xModifyListener );
- m_aDiagrams.erase( aIt );
- return true;
-}
-
void ImplChartModel::AppendDiagram( const Reference< chart2::XDiagram > & xDiagram )
{
Reference< util::XModifyBroadcaster > xBroadcaster( xDiagram, uno::UNO_QUERY );
@@ -414,12 +313,6 @@ Reference< chart2::XChartTypeManager > ImplChartModel::GetChartTypeManager()
return m_xChartTypeManager;
}
-void ImplChartModel::SetChartTypeTemplate(
- const Reference< chart2::XChartTypeTemplate > & xTemplate )
-{
- m_xChartTypeTemplate = xTemplate;
-}
-
Reference< chart2::XChartTypeTemplate > ImplChartModel::GetChartTypeTemplate()
{
return m_xChartTypeTemplate;
@@ -562,45 +455,6 @@ Reference< chart2::XUndoManager > ImplChartModel::GetUndoManager()
return m_xUndoManager;
}
-// OUString
-::std::vector< Reference< chart2::data::XLabeledDataSequence > > ImplChartModel::GetData()
-{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResult;
-
- Reference< chart2::XDiagram > xDia;
- if( m_aDiagrams.size() > 0 )
- xDia.set( GetDiagram(0) );
-
- if( xDia.is())
- {
- try
- {
- // categories
- Reference< chart2::data::XLabeledDataSequence > xCategories(
- DiagramHelper::getCategoriesFromDiagram( xDia ));
- aResult.push_back( xCategories );
-
- // data series
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
- DiagramHelper::getDataSeriesFromDiagram( xDia ));
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
- aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
- {
- Reference< chart2::data::XDataSource > xSource( *aIt, uno::UNO_QUERY_THROW );
- Sequence< Reference< chart2::data::XLabeledDataSequence > > aDataSeq( xSource->getDataSequences());
- ::std::copy( aDataSeq.getConstArray(), aDataSeq.getConstArray() + aDataSeq.getLength(),
- back_inserter( aResult ));
- }
- }
- catch( uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
- }
-
- return aResult;
-}
-
void ImplChartModel::SetNewData( const Reference< chart2::data::XDataSource > & xDataSource,
const Sequence< beans::PropertyValue > & rArgs )
{
diff --git a/chart2/source/model/main/ImplChartModel.hxx b/chart2/source/model/main/ImplChartModel.hxx
index edfa7be60727..9a912feee246 100644
--- a/chart2/source/model/main/ImplChartModel.hxx
+++ b/chart2/source/model/main/ImplChartModel.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ImplChartModel.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -106,8 +106,6 @@ public:
void RemoveAllDiagrams();
/** @return true, if the chart was found and removed, false otherwise.
*/
- bool RemoveDiagram( const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDiagram > & xDiagram );
void AppendDiagram( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram );
::com::sun::star::uno::Reference<
@@ -141,10 +139,6 @@ public:
::com::sun::star::chart2::XChartTypeManager >
GetChartTypeManager();
- void SetChartTypeTemplate(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartTypeTemplate > & xTemplate );
-
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate >
GetChartTypeTemplate();
@@ -166,9 +160,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XUndoManager >
GetUndoManager();
- ::std::vector< ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XLabeledDataSequence > > GetData();
-
void CreateDefaultChart();
::com::sun::star::uno::Reference<
diff --git a/chart2/source/model/main/Style.cxx b/chart2/source/model/main/Style.cxx
index b9cfee4ecce7..e69de29bb2d1 100644
--- a/chart2/source/model/main/Style.cxx
+++ b/chart2/source/model/main/Style.cxx
@@ -1,161 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Style.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "Style.hxx"
-#include "macros.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::RuntimeException;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-// necessary for MS compiler
-using ::comphelper::OPropertyContainer;
-using ::chart::impl::Style_Base;
-
-namespace
-{
-static const ::rtl::OUString lcl_aImplName(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart.Style" ));
-} // anonymous namespace
-
-namespace chart
-{
-
-Style::Style( const Reference< container::XNameContainer > & xStyleFamiliyToAddTo ) :
- OPropertyContainer( GetBroadcastHelper()),
- Style_Base( GetMutex()),
- m_xStyleFamily( xStyleFamiliyToAddTo ),
- m_aName( C2U( "Default" ) ),
- m_bUserDefined( sal_False )
-{
- OSL_ENSURE( m_xStyleFamily.is(), "No StyleFamily to add style to" );
-}
-
-Style::~Style()
-{}
-
-sal_Bool SAL_CALL Style::isUserDefined()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- return m_bUserDefined;
- // \--
-}
-
-sal_Bool SAL_CALL Style::isInUse()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
-
- // aBoundLC is a member of cppuhelper::OPropertySetHelper
- // it is assumed that a style is in use whenever some component is
- // registered here as listener
- return ( aBoundLC.getContainedTypes().getLength() > 0 );
- // \--
-}
-
-OUString SAL_CALL Style::getParentStyle()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- return m_aParentStyleName;
- // \--
-}
-
-void SAL_CALL Style::setParentStyle( const OUString& aParentStyle )
- throw (container::NoSuchElementException,
- RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- m_aParentStyleName = aParentStyle;
- // \--
-}
-
-
-OUString SAL_CALL Style::getName()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- return m_aName;
- // \--
-}
-
-void SAL_CALL Style::setName( const OUString& aName )
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- OSL_ASSERT( m_xStyleFamily.is());
-
- if( m_xStyleFamily.is() )
- {
- // remove old name
- if( m_aName.getLength() > 0 )
- {
- Reference< container::XNameAccess > xAccess( m_xStyleFamily, uno::UNO_QUERY );
- OSL_ASSERT( xAccess.is());
- if( xAccess->hasByName( m_aName ))
- m_xStyleFamily->removeByName( m_aName );
- }
-
- // change name
- m_aName = aName;
-
- // add new name
- m_xStyleFamily->insertByName( m_aName, uno::makeAny( this ));
- }
- // \--
-}
-
-IMPLEMENT_FORWARD_XINTERFACE2( Style, Style_Base, OPropertyContainer )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( Style, Style_Base, OPropertyContainer )
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
-APPHELPER_XSERVICEINFO_IMPL( Style, lcl_aImplName )
-
-uno::Sequence< OUString > Style::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 1 );
- aServices[ 0 ] = C2U( "com.sun.star.style.Style" );
- return aServices;
-}
-
-} // namespace chart
diff --git a/chart2/source/model/main/Style.hxx b/chart2/source/model/main/Style.hxx
index feee550f089f..e69de29bb2d1 100644
--- a/chart2/source/model/main/Style.hxx
+++ b/chart2/source/model/main/Style.hxx
@@ -1,116 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: Style.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_STYLE_HXX
-#define CHART_STYLE_HXX
-
-// helper classes
-#include <cppuhelper/compbase2.hxx>
-#include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
-#include <comphelper/propertycontainer.hxx>
-#include <comphelper/proparrhlp.hxx>
-
-#include "ServiceMacros.hxx"
-
-// interfaces and types
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/style/XStyle.hpp>
-
-namespace com { namespace sun { namespace star { namespace container {
- class XNameContainer;
-}}}}
-
-namespace chart
-{
-
-namespace impl
-{
-typedef ::cppu::WeakComponentImplHelper2<
- ::com::sun::star::style::XStyle,
- ::com::sun::star::lang::XServiceInfo > Style_Base;
-}
-
-class Style :
- public ::comphelper::OMutexAndBroadcastHelper,
- public ::comphelper::OPropertyContainer,
- public ::comphelper::OPropertyArrayUsageHelper< Style >,
- public impl::Style_Base
-{
-public:
- Style( const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameContainer > & xStyleFamiliyToAddTo );
- virtual ~Style();
-
- void RegisterProperties(
- const ::std::vector< ::com::sun::star::beans::Property > & rProperties,
- ::std::vector< ::com::sun::star::uno::Any > & rOutProperties );
-
- /// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
-
- /// merge XInterface implementations
- DECLARE_XINTERFACE()
- /// merge XTypeProvider implementations
- DECLARE_XTYPEPROVIDER()
-
-protected:
- // ____ style::XStyle ____
- virtual sal_Bool SAL_CALL isUserDefined() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL isInUse() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getParentStyle() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-
- // ____ container::XNamed (base of XStyle) ____
- virtual ::rtl::OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-
- // ____ beans::XPropertySet ____
- /// @see ::com::sun::star::beans::XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException);
- /// @see ::comphelper::OPropertySetHelper
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
- /// @see ::comphelper::OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
-
-private:
- ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameContainer > m_xStyleFamily;
-
- ::rtl::OUString m_aName;
- ::rtl::OUString m_aParentStyleName;
- sal_Bool m_bUserDefined;
-};
-
-} // namespace chart
-
-// CHART_STYLE_HXX
-#endif
diff --git a/chart2/source/model/main/StyleFamilies.cxx b/chart2/source/model/main/StyleFamilies.cxx
index 32c9d978de0d..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamilies.cxx
+++ b/chart2/source/model/main/StyleFamilies.cxx
@@ -1,179 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamilies.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "StyleFamilies.hxx"
-#include "macros.hxx"
-
-#include <algorithm>
-#include <functional>
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-namespace chart
-{
-
-StyleFamilies::StyleFamilies()
-{
-}
-
-StyleFamilies::~StyleFamilies()
-{}
-
-bool StyleFamilies::AddStyleFamily(
- const OUString & rName,
- const Reference< container::XNameAccess > & rFamily )
-{
- if( m_aStyleFamilies.find( rName ) == m_aStyleFamilies.end() )
- {
- m_aStyleFamilies[ rName ] = rFamily;
- return true;
- }
-
- return false;
-}
-
-// container::XNameAccess
-Any SAL_CALL StyleFamilies::getByName( const OUString& aName )
- throw (container::NoSuchElementException,
- lang::WrappedTargetException,
- RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
-
- tStyleFamilyContainer::const_iterator aIt( m_aStyleFamilies.find( aName ));
- if( aIt == m_aStyleFamilies.end())
- {
- throw container::NoSuchElementException(
- aName,
- static_cast< ::cppu::OWeakObject* >( this ));
- }
-
- OSL_ASSERT( (*aIt).first.equals( aName ));
- return uno::makeAny( (*aIt).second );
- // \--
-}
-
-uno::Sequence< OUString > SAL_CALL StyleFamilies::getElementNames()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- Sequence< OUString > aResult( m_aStyleFamilies.size());
-
- ::std::transform( m_aStyleFamilies.begin(), m_aStyleFamilies.end(),
- aResult.getArray(),
- ::std::select1st< tStyleFamilyContainer::value_type >() );
-
- return aResult;
- // \--
-}
-
-sal_Bool SAL_CALL StyleFamilies::hasByName( const OUString& aName )
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
-
- return ( m_aStyleFamilies.find( aName ) != m_aStyleFamilies.end() );
- // \--
-}
-
-
-// container::XIndexAccess (optional)
-sal_Int32 SAL_CALL StyleFamilies::getCount()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- return m_aStyleFamilies.size();
- // \--
-}
-
-Any SAL_CALL StyleFamilies::getByIndex( sal_Int32 Index )
- throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- tStyleFamilyContainer::const_iterator aIt( m_aStyleFamilies.begin());
- sal_Int32 nCounter = 0;
- for( ;
- ( nCounter < Index ) && ( aIt != m_aStyleFamilies.end());
- ++nCounter, ++aIt );
-
- if( aIt == m_aStyleFamilies.end())
- {
- throw container::NoSuchElementException(
- OUString::valueOf( Index ),
- static_cast< ::cppu::OWeakObject* >( this ));
- }
-
- return uno::makeAny( (*aIt).second );
- // \--
-}
-
-
-// container::XElementAccess (base of XNameAccess and XIndexAccess)
-uno::Type SAL_CALL StyleFamilies::getElementType()
- throw (RuntimeException)
-{
- return ::getCppuType( reinterpret_cast< Reference< container::XNameAccess > * >(0));
-}
-
-sal_Bool SAL_CALL StyleFamilies::hasElements()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- return ! m_aStyleFamilies.empty();
- // \--
-}
-
-// lang::XServiceInfo
-
-APPHELPER_XSERVICEINFO_IMPL( StyleFamilies, C2U( "com.sun.star.comp.chart2.StyleFamilies" ))
-
-Sequence< OUString > StyleFamilies::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 1 );
- aServices[ 0 ] = C2U( "com.sun.star.style.StyleFamilies" );
-
- return aServices;
-}
-
-} // namespace chart
diff --git a/chart2/source/model/main/StyleFamilies.hxx b/chart2/source/model/main/StyleFamilies.hxx
index 5598dbf0eacc..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamilies.hxx
+++ b/chart2/source/model/main/StyleFamilies.hxx
@@ -1,103 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamilies.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_STYLEFAMILIES_HXX
-#define CHART_STYLEFAMILIES_HXX
-
-#include <cppuhelper/implbase2.hxx>
-#include <osl/mutex.hxx>
-
-#include "ServiceMacros.hxx"
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <map>
-
-namespace chart
-{
-
-class StyleFamilies : public ::cppu::WeakImplHelper2 <
- ::com::sun::star::container::XNameAccess,
- ::com::sun::star::lang::XServiceInfo >
-{
-public:
- StyleFamilies();
- virtual ~StyleFamilies();
-
- /** adds a style family.
-
- @param rName the name under which the family can later be accessed
- through the XNameAccess.
-
- @param rFamily the style family object supporting the service
- ::com::sun::star::style::StyleFamily.
-
- @return true, if the family was added. In case there already exists a
- family with the name given in rName, nothing is done and false
- is returned.
- */
- bool AddStyleFamily(
- const ::rtl::OUString & rName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess > & rFamily );
-
-protected:
- // container::XNameAccess
- //
- // Note: The elements within this collection are StyleFamily instances.
- // (only mandatory interface: XNameAccess)
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-
- // container::XIndexAccess (optional)
- virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
- // container::XElementAccess (base of XNameAccess and XIndexAccess)
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException);
-
- APPHELPER_XSERVICEINFO_DECL()
-
- typedef ::std::map< ::rtl::OUString,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::container::XNameAccess > >
- tStyleFamilyContainer;
-
-private:
- tStyleFamilyContainer m_aStyleFamilies;
- ::osl::Mutex m_aMutex;
-};
-
-} // namespace chart
-
-// CHART_STYLEFAMILIES_HXX
-#endif
diff --git a/chart2/source/model/main/StyleFamily.cxx b/chart2/source/model/main/StyleFamily.cxx
index f5cfe8bbccbe..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamily.cxx
+++ b/chart2/source/model/main/StyleFamily.cxx
@@ -1,267 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamily.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "StyleFamily.hxx"
-#include "macros.hxx"
-#include <com/sun/star/style/XStyle.hpp>
-
-#include <algorithm>
-#include <functional>
-
-using namespace ::com::sun::star;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::RuntimeException;
-using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-namespace chart
-{
-
-StyleFamily::StyleFamily()
-{}
-
-StyleFamily::~StyleFamily()
-{}
-
-bool StyleFamily::AddStyle(
- const Reference< style::XStyle > & rStyle )
-{
- bool bRet = false;
-
- if( rStyle.is())
- {
- OUString aName( rStyle->getName() );
- m_aStyles[ aName ] = rStyle;
- bRet = true;
- }
-
- return bRet;
-}
-
-// container::XNameAccess (also base of XNameReplace)
-uno::Any SAL_CALL StyleFamily::getByName( const OUString& aName )
- throw (container::NoSuchElementException,
- lang::WrappedTargetException,
- RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
-
- tStyleContainer::const_iterator aIt( m_aStyles.find( aName ));
- if( aIt == m_aStyles.end())
- {
- throw container::NoSuchElementException(
- aName,
- static_cast< ::cppu::OWeakObject* >( this ));
- }
-
- OSL_ASSERT( (*aIt).first.equals( aName ));
- return uno::makeAny( (*aIt).second );
- // \--
-}
-
-Sequence< OUString > SAL_CALL StyleFamily::getElementNames()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- Sequence< OUString > aResult( m_aStyles.size());
-
- ::std::transform( m_aStyles.begin(), m_aStyles.end(),
- aResult.getArray(),
- ::std::select1st< tStyleContainer::value_type >() );
-
- return aResult;
- // \--
-}
-
-sal_Bool SAL_CALL StyleFamily::hasByName( const OUString& aName )
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
-
- return ( m_aStyles.find( aName ) != m_aStyles.end() );
- // \--
-}
-
-
-// container::XNameContainer (optional)
-void SAL_CALL StyleFamily::insertByName( const OUString& aName, const uno::Any& aElement )
- throw (lang::IllegalArgumentException,
- container::ElementExistException,
- lang::WrappedTargetException,
- RuntimeException)
-{
- uno::Reference< style::XStyle > xStyle;
- if( aElement >>= xStyle )
- {
- // /--
- MutexGuard aGuard( m_aMutex );
- if( m_aStyles.find( aName ) != m_aStyles.end() )
- {
- throw container::ElementExistException(
- aName,
- static_cast< ::cppu::OWeakObject* >( this ) );
- }
-
- m_aStyles[ aName ] = xStyle;
- // \--
- }
- else
- {
- throw lang::IllegalArgumentException(
- aName,
- static_cast< ::cppu::OWeakObject* >( this ),
- 1 /* index */ );
- }
-}
-
-void SAL_CALL StyleFamily::removeByName( const OUString& Name )
- throw (container::NoSuchElementException,
- lang::WrappedTargetException,
- RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- tStyleContainer::iterator aIt( m_aStyles.find( Name ));
- if( aIt == m_aStyles.end())
- {
- throw container::NoSuchElementException(
- Name,
- static_cast< ::cppu::OWeakObject* >( this ) );
- }
-
- m_aStyles.erase( aIt );
- // \--
-}
-
-
-// container::XIndexAccess (optional)
-sal_Int32 SAL_CALL StyleFamily::getCount()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- return m_aStyles.size();
- // \--
-}
-
-uno::Any SAL_CALL StyleFamily::getByIndex( sal_Int32 Index )
- throw (lang::IndexOutOfBoundsException,
- lang::WrappedTargetException,
- RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- tStyleContainer::const_iterator aIt( m_aStyles.begin());
- sal_Int32 nCounter = 0;
- for( ;
- ( nCounter < Index ) && ( aIt != m_aStyles.end());
- ++nCounter, ++aIt );
-
- if( aIt == m_aStyles.end())
- {
- throw container::NoSuchElementException(
- OUString::valueOf( Index ),
- static_cast< ::cppu::OWeakObject* >( this ));
- }
-
- return uno::makeAny( (*aIt).second );
- // \--
-}
-
-
-// container::XElementAccess (base of XNameAccess and XIndexAccess)
-uno::Type SAL_CALL StyleFamily::getElementType()
- throw (RuntimeException)
-{
- return ::getCppuType( reinterpret_cast< Reference< style::XStyle > * >(0));
-}
-
-sal_Bool SAL_CALL StyleFamily::hasElements()
- throw (RuntimeException)
-{
- // /--
- MutexGuard aGuard( m_aMutex );
- return ! m_aStyles.empty();
- // \--
-}
-
-
-// container::XNameReplace
-void SAL_CALL StyleFamily::replaceByName( const OUString& aName, const uno::Any& aElement )
- throw (lang::IllegalArgumentException,
- container::NoSuchElementException,
- lang::WrappedTargetException,
- RuntimeException)
-{
- uno::Reference< style::XStyle > xStyle;
- if( aElement >>= xStyle )
- {
- // /--
- MutexGuard aGuard( m_aMutex );
- tStyleContainer::const_iterator aIt( m_aStyles.begin());
- if( aIt == m_aStyles.end())
- {
- throw container::NoSuchElementException(
- aName,
- static_cast< ::cppu::OWeakObject* >( this ) );
- }
-
- m_aStyles[ aName ] = xStyle;
- // \--
- }
- else
- {
- throw lang::IllegalArgumentException(
- aName,
- static_cast< ::cppu::OWeakObject* >( this ),
- 1 /* index */ );
- }
-}
-
-// lang::XServiceInfo
-
-APPHELPER_XSERVICEINFO_IMPL( StyleFamily, C2U( "com.sun.star.comp.chart2.StyleFamily" ))
-
-Sequence< OUString > StyleFamily::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 1 );
- aServices[ 0 ] = C2U( "com.sun.star.style.StyleFamily" );
-
- return aServices;
-}
-
-} // namespace chart
diff --git a/chart2/source/model/main/StyleFamily.hxx b/chart2/source/model/main/StyleFamily.hxx
index 200c5dc5549e..e69de29bb2d1 100644
--- a/chart2/source/model/main/StyleFamily.hxx
+++ b/chart2/source/model/main/StyleFamily.hxx
@@ -1,115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: StyleFamily.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CHART_STYLEFAMILY_HXX
-#define CHART_STYLEFAMILY_HXX
-
-#include <cppuhelper/implbase3.hxx>
-#include <osl/mutex.hxx>
-
-#include "ServiceMacros.hxx"
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <map>
-
-namespace com { namespace sun { namespace star {
- namespace style {
- class XStyle;
- }
-}}}
-
-namespace chart
-{
-
-class StyleFamily : public
- ::cppu::WeakImplHelper3<
- ::com::sun::star::container::XNameContainer,
- ::com::sun::star::container::XIndexAccess,
- ::com::sun::star::lang::XServiceInfo
- >
-{
-public:
- StyleFamily();
- virtual ~StyleFamily();
-
- /** adds a style.
-
- @param rStyle the style object supporting the service
- ::com::sun::star::style::Style. The name under which this object
- can be accessed through XNameAccess is the one you get from
- XNamed::getName() (XNamed is a base interface for XStyle.)
-
- @return true, if the style was added. In case there already exists a
- style with the name given in getName(), nothing is done and
- false is returned.
- */
- bool AddStyle( const ::com::sun::star::uno::Reference<
- ::com::sun::star::style::XStyle > & rStyle );
-
-protected:
-
- // container::XNameAccess (also base of XNameReplace)
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
-
- // container::XNameContainer (optional, base of XNameReplace)
- virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
- // container::XIndexAccess (optional)
- virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
- // container::XElementAccess (base of XNameAccess and XIndexAccess)
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException);
-
- // container::XNameReplace (base of XNameAccess)
- virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
- APPHELPER_XSERVICEINFO_DECL()
-
- typedef ::std::map< ::rtl::OUString,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::style::XStyle > >
- tStyleContainer;
-
-private:
- tStyleContainer m_aStyles;
- ::osl::Mutex m_aMutex;
-};
-
-} // namespace chart
-
-// CHART_STYLEFAMILY_HXX
-#endif
diff --git a/chart2/source/model/main/makefile.mk b/chart2/source/model/main/makefile.mk
index e9188385aef2..775e7b60e9b9 100644
--- a/chart2/source/model/main/makefile.mk
+++ b/chart2/source/model/main/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.8.44.1 $
#
# This file is part of OpenOffice.org.
#
@@ -54,9 +54,7 @@ SLOFILES= \
$(SLO)$/ChartModel_Persistence.obj \
$(SLO)$/DataPoint.obj \
$(SLO)$/DataPointProperties.obj \
- $(SLO)$/DataPointStyle.obj \
$(SLO)$/DataSeries.obj \
- $(SLO)$/DataSeriesStyle.obj \
$(SLO)$/Diagram.obj \
$(SLO)$/DataSeriesProperties.obj \
$(SLO)$/FormattedString.obj \
@@ -65,8 +63,6 @@ SLOFILES= \
$(SLO)$/PageBackground.obj \
$(SLO)$/PolarCoordinateSystem.obj \
$(SLO)$/StockBar.obj \
- $(SLO)$/StyleFamilies.obj \
- $(SLO)$/StyleFamily.obj \
$(SLO)$/Title.obj \
$(SLO)$/Wall.obj \
$(SLO)$/_serviceregistration_model.obj
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 083bcc47d4b9..a8eb36d6e5c8 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartTypeManager.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +32,6 @@
#include "precompiled_chart2.hxx"
#include "ChartTypeManager.hxx"
#include "macros.hxx"
-#include "ContextHelper.hxx"
#include "StackMode.hxx"
#include "ContainerHelper.hxx"
@@ -48,6 +47,7 @@
#include "StockChartTypeTemplate.hxx"
#include "NetChartTypeTemplate.hxx"
#include <cppuhelper/component_context.hxx>
+#include <comphelper/InlineContainer.hxx>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
#include <com/sun/star/chart/ChartSolidType.hpp>
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 580b1516a372..c433292fe6ee 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AxisHelper.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -134,7 +134,7 @@ Reference< XAxis > AxisHelper::createAxis(
// set correct initial AutoScale
if( pRefSizeProvider )
- pRefSizeProvider->setValuesAtPropertySet( xProp, ReferenceSizeProvider::REF_DIAGRAM );
+ pRefSizeProvider->setValuesAtPropertySet( xProp );
}
catch( uno::Exception& e )
{
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 1542b586bc72..68cbcb50caa7 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: CachedDataSequence.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.24.1 $
*
* This file is part of OpenOffice.org.
*
@@ -201,24 +201,6 @@ void CachedDataSequence::registerProperties()
::getCppuType( & m_aHiddenValues ) );
}
-void CachedDataSequence::PreferMixedData()
-{
- if( m_eCurrentDataType != MIXED )
- Impl_setMixedData( Impl_getMixedData() );
-}
-
-void CachedDataSequence::PreferNumericalData()
-{
- if( m_eCurrentDataType != NUMERICAL )
- Impl_setNumericalData( Impl_getNumericalData() );
-}
-
-void CachedDataSequence::PreferTextualData()
-{
- if( m_eCurrentDataType != TEXTUAL )
- Impl_setTextualData( Impl_getTextualData() );
-}
-
Sequence< double > CachedDataSequence::Impl_getNumericalData() const
{
if( m_eCurrentDataType == NUMERICAL )
@@ -311,39 +293,6 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const
return aResult;
}
-void CachedDataSequence::Impl_setNumericalData( const Sequence< double > & rSeq )
-{
- if( m_eCurrentDataType != NUMERICAL )
- {
- m_aTextualSequence.realloc( 0 );
- m_aMixedSequence.realloc( 0 );
- m_eCurrentDataType = NUMERICAL;
- }
- m_aNumericalSequence = rSeq;
-}
-
-void CachedDataSequence::Impl_setTextualData( const Sequence< OUString > & rSeq )
-{
- if( m_eCurrentDataType != TEXTUAL )
- {
- m_aNumericalSequence.realloc( 0 );
- m_aMixedSequence.realloc( 0 );
- m_eCurrentDataType = TEXTUAL;
- }
- m_aTextualSequence = rSeq;
-}
-
-void CachedDataSequence::Impl_setMixedData( const Sequence< uno::Any > & rSeq )
-{
- if( m_eCurrentDataType != MIXED )
- {
- m_aNumericalSequence.realloc( 0 );
- m_aTextualSequence.realloc( 0 );
- m_eCurrentDataType = MIXED;
- }
- m_aMixedSequence = rSeq;
-}
-
// ================================================================================
Sequence< OUString > CachedDataSequence::getSupportedServiceNames_Static()
@@ -403,16 +352,6 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
// \--
}
-// void SAL_CALL CachedDataSequence::setNumericalData( const Sequence< double >& aData )
-// throw (uno::RuntimeException)
-// {
-// // /--
-// MutexGuard aGuard( GetMutex() );
-// Impl_setNumericalData( aData );
-// // \--
-// }
-
-
// ________ XTextualDataSequence ________
Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
throw (uno::RuntimeException)
@@ -502,11 +441,6 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X
}
}
-void CachedDataSequence::fireModifyEvent()
-{
- // note: currently never called, as the data is not mutable
- m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
-}
// lang::XInitialization:
void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception)
{
diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx
index 27824a6694c8..9486180ececd 100644
--- a/chart2/source/tools/ChartDebugTrace.cxx
+++ b/chart2/source/tools/ChartDebugTrace.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartDebugTrace.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -321,6 +321,8 @@ namespace chart
namespace debug
{
+#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
+
void ChartDebugTraceDocument(
const Reference< XChartDocument > & /*xDoc*/,
int /*nIndent*/ )
@@ -412,6 +414,7 @@ void ChartDebugTraceDiagram(
*/
}
+#endif
} // namespace debug
} // namespace chart
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 92210445f29d..b85cb717bff6 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: CommonConverters.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -129,21 +129,6 @@ drawing::HomogenMatrix3 B2DHomMatrixToHomogenMatrix3( const ::basegfx::B2DHomMat
return aHM;
}
-::basegfx::B2DHomMatrix HomogenMatrix3ToB2DHomMatrix( const drawing::HomogenMatrix3& rHM )
-{
- ::basegfx::B2DHomMatrix aM;
- aM.set(0, 0, rHM.Line1.Column1);
- aM.set(0, 1, rHM.Line1.Column2);
- aM.set(0, 2, rHM.Line1.Column3);
- aM.set(1, 0, rHM.Line2.Column1);
- aM.set(1, 1, rHM.Line2.Column2);
- aM.set(1, 2, rHM.Line2.Column3);
- aM.set(2, 0, rHM.Line3.Column1);
- aM.set(2, 1, rHM.Line3.Column2);
- aM.set(2, 2, rHM.Line3.Column3);
- return aM;
-}
-
::basegfx::B3DPoint Position3DToB3DPoint( const drawing::Position3D& rPosition )
{
return ::basegfx::B3DPoint(
@@ -161,15 +146,6 @@ drawing::Direction3D B3DVectorToDirection3D( const ::basegfx::B3DVector& rVector
);
}
-drawing::Position3D B3DVectorToPosition3D( const ::basegfx::B3DVector& rVector)
-{
- return drawing::Position3D(
- rVector.getX()
- , rVector.getY()
- , rVector.getZ()
- );
-}
-
drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint)
{
return drawing::Position3D(
@@ -188,39 +164,6 @@ drawing::Position3D B3DPointToPosition3D( const ::basegfx::B3DPoint& rPoint)
);
}
-drawing::PolyPolygonShape3D MakeLine3D(
- const drawing::Position3D & rStart,
- const drawing::Position3D & rEnd )
-{
- drawing::PolyPolygonShape3D aPP;
-
- aPP.SequenceX.realloc(1);
- aPP.SequenceY.realloc(1);
- aPP.SequenceZ.realloc(1);
-
- drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray();
- drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray();
- drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray();
-
- pOuterSequenceX->realloc(2);
- pOuterSequenceY->realloc(2);
- pOuterSequenceZ->realloc(2);
-
- double* pInnerSequenceX = pOuterSequenceX->getArray();
- double* pInnerSequenceY = pOuterSequenceY->getArray();
- double* pInnerSequenceZ = pOuterSequenceZ->getArray();
-
- *pInnerSequenceX++ = rStart.PositionX;
- *pInnerSequenceY++ = rStart.PositionY;
- *pInnerSequenceZ++ = rStart.PositionZ;
-
- *pInnerSequenceX++ = rEnd.PositionX;
- *pInnerSequenceY++ = rEnd.PositionY;
- *pInnerSequenceZ++ = rEnd.PositionZ;
-
- return aPP;
-}
-
void AddPointToPoly( drawing::PolyPolygonShape3D& rPoly, const drawing::Position3D& rPos, sal_Int32 nPolygonIndex )
{
if(nPolygonIndex<0)
@@ -467,31 +410,6 @@ drawing::PolyPolygonShape3D BezierToPoly(
return aRet;
}
-drawing::PolyPolygonShape3D PointSequenceToPoly(
- const drawing::PointSequenceSequence& rPointSequence )
-{
- drawing::PolyPolygonShape3D aRet;
- aRet.SequenceX.realloc( rPointSequence.getLength() );
- aRet.SequenceY.realloc( rPointSequence.getLength() );
- aRet.SequenceZ.realloc( rPointSequence.getLength() );
-
- for(sal_Int32 nN = 0; nN < rPointSequence.getLength(); nN++)
- {
- sal_Int32 nInnerLength = rPointSequence[nN].getLength();
- aRet.SequenceX[nN].realloc( nInnerLength );
- aRet.SequenceY[nN].realloc( nInnerLength );
- aRet.SequenceZ[nN].realloc( nInnerLength );
-
- for( sal_Int32 nM = 0; nM < nInnerLength; nM++)
- {
- aRet.SequenceX[nN][nM] = rPointSequence[nN][nM].X;
- aRet.SequenceY[nN][nM] = rPointSequence[nN][nM].Y;
- aRet.SequenceZ[nN][nM] = 0.0;
- }
- }
- return aRet;
-}
-
drawing::PointSequenceSequence PolyToPointSequence(
const drawing::PolyPolygonShape3D& rPolyPolygon )
{
@@ -524,66 +442,6 @@ void appendPointSequence( drawing::PointSequenceSequence& rTarget
rTarget[nOldCount+nS]=rAdd[nS];
}
-Polygon PolyToToolsPoly( const drawing::PolyPolygonShape3D& rPolyPolygon )
-{
- sal_Int32 nOuterLength = rPolyPolygon.SequenceX.getLength();
- if(!nOuterLength)
- return Polygon();
-
- sal_Int32 nNewSize = nOuterLength;
- sal_Int32 nNewIndex = 0;
- Polygon aRet(static_cast<USHORT>(nNewSize));
-
- for(sal_Int32 nN = 0; nN < nOuterLength; nN++)
- {
- sal_Int32 nInnerLength = rPolyPolygon.SequenceX[nN].getLength();
- nNewSize += nInnerLength-1,
- aRet.SetSize(static_cast<USHORT>(nNewSize));
- for( sal_Int32 nM = 0; nM < nInnerLength; nM++)
- {
- aRet.SetPoint( Point( static_cast<long>(rPolyPolygon.SequenceX[nN][nM])
- , static_cast<long>(rPolyPolygon.SequenceY[nN][nM])
- )
- , static_cast<USHORT>(nNewIndex) );
- nNewIndex++;
- }
- }
- return aRet;
-}
-
-drawing::PolyPolygonShape3D ToolsPolyToPoly( const Polygon& rToolsPoly, double zValue )
-{
- sal_Int32 nPointCount = rToolsPoly.GetSize();
-
- drawing::PolyPolygonShape3D aPP;
-
- aPP.SequenceX.realloc(1);
- aPP.SequenceY.realloc(1);
- aPP.SequenceZ.realloc(1);
-
- drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray();
- drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray();
- drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray();
-
- pOuterSequenceX->realloc(nPointCount);
- pOuterSequenceY->realloc(nPointCount);
- pOuterSequenceZ->realloc(nPointCount);
-
- double* pInnerSequenceX = pOuterSequenceX->getArray();
- double* pInnerSequenceY = pOuterSequenceY->getArray();
- double* pInnerSequenceZ = pOuterSequenceZ->getArray();
-
- for( sal_Int32 nN = 0; nN<nPointCount; nN++ )
- {
- const Point& rPos = rToolsPoly.GetPoint( static_cast<USHORT>(nN) );
- *pInnerSequenceX++ = rPos.X();
- *pInnerSequenceY++ = rPos.Y();
- *pInnerSequenceZ++ = zValue;
- }
-
- return aPP;
-}
-
drawing::Position3D operator+( const drawing::Position3D& rPos
, const drawing::Direction3D& rDirection)
{
@@ -668,18 +526,6 @@ awt::Size Direction3DToAWTSize( const drawing::Direction3D& rDirection )
return aRet;
}
-::basegfx::B3DPoint SequenceToB3DPoint( const uno::Sequence< double >& rSeq )
-{
- OSL_ENSURE(rSeq.getLength()==3,"The sequence needs to have length 3 for conversion into vector");
-
- double x=rSeq.getLength()>0?rSeq[0]:0.0;
- double y=rSeq.getLength()>1?rSeq[1]:0.0;
- double z=rSeq.getLength()>2?rSeq[2]:0.0;
-
- ::basegfx::B3DPoint aRet(x,y,z);
- return aRet;
-}
-
uno::Sequence< double > B3DPointToSequence( const ::basegfx::B3DPoint& rPoint )
{
uno::Sequence< double > aRet(3);
@@ -709,24 +555,6 @@ uno::Sequence< double > Position3DToSequence( const drawing::Position3D& rPositi
return aRet;
}
-drawing::Direction3D SequenceToDirection3D( const uno::Sequence< double >& rSeq )
-{
- drawing::Direction3D aRet;
- aRet.DirectionX = rSeq.getLength()>0?rSeq[0]:0.0;
- aRet.DirectionY = rSeq.getLength()>1?rSeq[1]:0.0;
- aRet.DirectionZ = rSeq.getLength()>2?rSeq[2]:0.0;
- return aRet;
-}
-
-uno::Sequence< double > Direction3DToSequence( const drawing::Direction3D& rDirection )
-{
- uno::Sequence< double > aRet(3);
- aRet[0] = rDirection.DirectionX;
- aRet[1] = rDirection.DirectionY;
- aRet[2] = rDirection.DirectionZ;
- return aRet;
-}
-
drawing::Direction3D operator/( const drawing::Direction3D& rDirection, double f )
{
OSL_ENSURE(f,"a Direction3D is divided by NULL");
@@ -737,21 +565,6 @@ drawing::Direction3D operator/( const drawing::Direction3D& rDirection, double f
);
}
-text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWritingMode2 )
-{
- switch(nWritingMode2)
- {
- case text::WritingMode2::RL_TB:
- return text::WritingMode_RL_TB;
- case text::WritingMode2::TB_RL:
- return text::WritingMode_TB_RL;
- case text::WritingMode2::LR_TB:
- return text::WritingMode_LR_TB;
- default: // TL
- return text::WritingMode_TB_RL;//there can no correct conversion be done here
- }
-}
-
using namespace ::com::sun::star::chart2;
uno::Sequence< double > DataSequenceToDoubleSequence(
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 75964b42ead5..7e418f04ab7b 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ConfigColorScheme.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -65,7 +65,6 @@ public:
virtual ~ChartConfigItem();
void addPropertyNotification( const OUString & rPropertyName );
- void removePropertyNotification( const OUString & rPropertyName );
uno::Any getProperty( const OUString & aPropertyName );
@@ -101,12 +100,6 @@ void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName )
EnableNotification( ContainerHelper::ContainerToSequence( m_aPropertiesToNotify ));
}
-void ChartConfigItem::removePropertyNotification( const OUString & rPropertyName )
-{
- if( m_aPropertiesToNotify.erase( rPropertyName ))
- EnableNotification( ContainerHelper::ContainerToSequence( m_aPropertiesToNotify ));
-}
-
uno::Any ChartConfigItem::getProperty( const OUString & aPropertyName )
{
Sequence< uno::Any > aValues(
diff --git a/chart2/source/tools/ContextHelper.cxx b/chart2/source/tools/ContextHelper.cxx
index 541c22950869..e69de29bb2d1 100644
--- a/chart2/source/tools/ContextHelper.cxx
+++ b/chart2/source/tools/ContextHelper.cxx
@@ -1,64 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ContextHelper.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "ContextHelper.hxx"
-#include <cppuhelper/component_context.hxx>
-
-#include <vector>
-
-using namespace ::com::sun::star;
-
-namespace chart
-{
-
-namespace ContextHelper
-{
-
-uno::Reference< uno::XComponentContext >
- createContext(
- const tContextEntryMapType & rMap,
- const uno::Reference< uno::XComponentContext > & rDelegateContext )
-{
- ::std::vector< ::cppu::ContextEntry_Init > aVec( rMap.size());
- for( tContextEntryMapType::const_iterator aIt = rMap.begin();
- aIt != rMap.end();
- ++aIt )
- {
- aVec.push_back( ::cppu::ContextEntry_Init( (*aIt).first, (*aIt).second) );
- }
-
- return ::cppu::createComponentContext( & aVec[0], aVec.size(), rDelegateContext );
-}
-
-} // namespace ContextHelper
-
-} // namespace chart
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 646410dd28a9..c8dfbffec354 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSeriesHelper.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.24.1 $
*
* This file is part of OpenOffice.org.
*
@@ -176,17 +176,6 @@ OUString GetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xL
return aRet;
}
-void SetRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xLabeledDataSequence,
- const ::rtl::OUString& rRole )
-{
- if( xLabeledDataSequence.is() )
- {
- Reference< beans::XPropertySet > xProp( xLabeledDataSequence->getValues(), uno::UNO_QUERY );
- if( xProp.is() )
- xProp->setPropertyValue( C2U("Role"), uno::makeAny(rRole) ) ;
- }
-}
-
Reference< chart2::data::XLabeledDataSequence >
getDataSequenceByRole(
const Reference< chart2::data::XDataSource > & xSource, OUString aRole,
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index db69c039070d..5814de4724fa 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSource.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -61,32 +61,6 @@ DataSource::DataSource(
m_aDataSeq( rSequences )
{}
-DataSource::DataSource(
- const Sequence< Reference< chart2::data::XDataSequence > > & rSequences )
-{
- m_aDataSeq.realloc( rSequences.getLength());
- sal_Int32 i;
- for(i=rSequences.getLength(); --i;)
- {
- m_aDataSeq[i].set( new LabeledDataSequence( rSequences[i] ));
- }
-}
-
-DataSource::DataSource(
- const Sequence< Reference< chart2::data::XDataSequence > > & rSequences,
- const Sequence< Reference< chart2::data::XDataSequence > > & rLabel )
-{
- m_aDataSeq.realloc( rSequences.getLength());
- for( sal_Int32 i=0; i<rSequences.getLength(); ++i )
- {
- if( i < rLabel.getLength())
- m_aDataSeq[i].set( new LabeledDataSequence( rSequences[i], rLabel[i] ));
- else
- m_aDataSeq[i].set( new LabeledDataSequence( rSequences[i],
- Reference< chart2::data::XDataSequence >() ));
- }
-}
-
DataSource::~DataSource()
{}
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 9224a1c98d17..0de52f8a53ea 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DataSourceHelper.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -115,43 +115,6 @@ void lcl_addErrorBarRanges(
}
}
-struct lcl_migrateData : public ::std::unary_function<
- Reference< chart2::data::XLabeledDataSequence >, void >
-{
- lcl_migrateData( const Reference< chart2::data::XDataProvider > & xDataProvider ) :
- m_xDataProvider( xDataProvider )
- {}
-
- Reference< chart2::data::XDataSequence > migrateData(
- const Reference< chart2::data::XDataSequence > & xOldData )
- {
- if( ! xOldData.is())
- return xOldData;
-
- OSL_ASSERT( m_xDataProvider.is());
- Reference< chart2::data::XDataSequence > xNewData(
- m_xDataProvider->createDataSequenceByRangeRepresentation(
- xOldData->getSourceRangeRepresentation()));
- comphelper::copyProperties(
- Reference< beans::XPropertySet >( xOldData, uno::UNO_QUERY ),
- Reference< beans::XPropertySet >( xNewData, uno::UNO_QUERY ));
- return xNewData;
- }
-
- void operator()( const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
- {
- if( m_xDataProvider.is() && xLSeq.is())
- {
- xLSeq->setValues( migrateData( xLSeq->getValues()));
- xLSeq->setLabel( migrateData( xLSeq->getLabel()));
- }
- }
-
-private:
- Reference< chart2::data::XDataProvider > m_xDataProvider;
-};
-
-
} // anonymous namespace
uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
@@ -554,25 +517,6 @@ Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference<
return ContainerHelper::ContainerToSequence( aResult );
}
-bool DataSourceHelper::migrateData(
- const Reference< chart2::XChartDocument > & xChartDoc,
- const Reference< chart2::data::XDataProvider > & xNewDataProvider )
-{
- if( ! ( xChartDoc.is() && xNewDataProvider.is()))
- return false;
-
- bool bCouldMigrate = true;
- Reference< chart2::data::XDataSource > xDataSource(
- DataSourceHelper::getUsedData( xChartDoc, true /* bIncludeUnusedData */ ));
- Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq(
- xDataSource->getDataSequences());
- ::std::for_each( aLSeq.getArray(), aLSeq.getArray() + aLSeq.getLength(),
- lcl_migrateData( xNewDataProvider ));
-
- return bCouldMigrate;
-}
-
-
//.............................................................................
} //namespace chart
//.............................................................................
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 9a92be9bcfe1..a32655946259 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: DiagramHelper.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.18.22.4 $
*
* This file is part of OpenOffice.org.
*
@@ -62,26 +62,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::rtl::OUString;
-namespace
-{
-bool lcl_ChartTypeIsMemberOfCooSys(
- const Reference< chart2::XCoordinateSystem > & xCooSys,
- const Reference< chart2::XChartType > & xChartType )
-{
- Reference< chart2::XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY );
- if( xCTCnt.is())
- {
- Sequence< Reference< chart2::XChartType > > aChartTypes( xCTCnt->getChartTypes());
- for( sal_Int32 i=0; i<aChartTypes.getLength(); ++i )
- if( aChartTypes[i] == xChartType )
- return true;
- }
-
- return false;
-}
-
-} // anonymous namespace
-
namespace chart
{
@@ -412,11 +392,6 @@ StackMode DiagramHelper::getStackModeFromChartType(
bool& rbFound, bool& rbAmbiguous,
const Reference< XCoordinateSystem > & xCorrespondingCoordinateSystem )
{
- OSL_ASSERT( !xCorrespondingCoordinateSystem.is() ||
- lcl_ChartTypeIsMemberOfCooSys(
- xCorrespondingCoordinateSystem,
- xChartType ));
-
StackMode eStackMode = StackMode_NONE;
rbFound = false;
rbAmbiguous = false;
@@ -713,44 +688,6 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
return 0;
}
-//static
-uno::Reference< XCoordinateSystem > DiagramHelper::getCoordinateSystemOfChartType(
- const uno::Reference< chart2::XDiagram >& xDiagram
- , const uno::Reference< XChartType >& xGivenChartType )
-{
- if( !xGivenChartType.is() )
- return 0;
-
- //iterate through the model to find the given xChartType
- //the found parent indicates the coordinate system
-
- //iterate through all coordinate systems
- uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY );
- if( !xCooSysContainer.is())
- return 0;
-
- uno::Sequence< uno::Reference< XCoordinateSystem > > aCooSysList( xCooSysContainer->getCoordinateSystems() );
- for( sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS )
- {
- uno::Reference< XCoordinateSystem > xCooSys( aCooSysList[nCS] );
-
- //iterate through all chart types in the current coordinate system
- uno::Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY );
- OSL_ASSERT( xChartTypeContainer.is());
- if( !xChartTypeContainer.is() )
- continue;
- uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() );
- for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT )
- {
- uno::Reference< XChartType > xChartType( aChartTypeList[nT] );
-
- if( xGivenChartType==xChartType )
- return xCooSys;
- }
- }
- return 0;
-}
-
// static
::std::vector< Reference< XDataSeries > >
DiagramHelper::getDataSeriesFromDiagram(
@@ -1362,29 +1299,6 @@ bool DiagramHelper::moveSeries( const Reference< XDiagram >& xDiagram, const Ref
return bMoved;
}
-sal_Int32 DiagramHelper::getIndexOfSeriesWithinChartType(
- const Reference< XDataSeries >& xDataSeries,
- const Reference< XChartType >& xChartType )
-{
- sal_Int32 nRet = -1;
-
- uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY );
- if( xDataSeriesContainer.is() )
- {
- uno::Sequence< uno::Reference< XDataSeries > > aSeriesList( xDataSeriesContainer->getDataSeries() );
- for( sal_Int32 nS = 0; nS < aSeriesList.getLength(); ++nS )
- {
- if( xDataSeries==aSeriesList[nS] )
- {
- nRet = nS;
- break;
- }
- }
- }
-
- return nRet;
-}
-
bool DiagramHelper::isSupportingFloorAndWall( const Reference<
chart2::XDiagram >& xDiagram )
{
diff --git a/chart2/source/tools/ImplUndoManager.cxx b/chart2/source/tools/ImplUndoManager.cxx
index 84da1ea0f534..d5eab1b4b652 100644
--- a/chart2/source/tools/ImplUndoManager.cxx
+++ b/chart2/source/tools/ImplUndoManager.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ImplUndoManager.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -419,11 +419,6 @@ void UndoStack::limitSize( sal_Int32 nMaxSize )
applyLimitation();
}
-sal_Int32 UndoStack::getCurrentLimitation() const
-{
- return m_nSizeLimit;
-}
-
void UndoStack::applyLimitation()
{
if( m_aStack.size() > static_cast< sal_uInt32 >( m_nSizeLimit ))
diff --git a/chart2/source/tools/ImplUndoManager.hxx b/chart2/source/tools/ImplUndoManager.hxx
index 842c6ae3dbca..94d04b69a5a4 100644
--- a/chart2/source/tools/ImplUndoManager.hxx
+++ b/chart2/source/tools/ImplUndoManager.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ImplUndoManager.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -177,7 +177,6 @@ public:
// removes all actions that have been inserted more than nMaxSize steps ago.
// The models of those actions are disposed of
void limitSize( sal_Int32 nMaxSize );
- sal_Int32 getCurrentLimitation() const;
private:
void applyLimitation();
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 65377a19d3a3..83c3a1e5a059 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: LabeledDataSequence.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -164,11 +164,6 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::
}
}
-void LabeledDataSequence::fireModifyEvent()
-{
- m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
-}
-
// ================================================================================
Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static()
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index b27be669532c..d379d2152a38 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: MediaDescriptorHelper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -217,27 +217,6 @@ MediaDescriptorHelper::~MediaDescriptorHelper()
}
uno::Sequence< beans::PropertyValue > MediaDescriptorHelper
-::getAll()
-{
- uno::Sequence< beans::PropertyValue > aAll( m_aRegularProperties );
- //write properties to aAll
- if( m_aDeprecatedProperties.getLength() )
- {
- sal_Int32 nCount = aAll.getLength();
- aAll.realloc( nCount + m_aDeprecatedProperties.getLength());
- for(sal_Int32 i=0;i<m_aDeprecatedProperties.getLength();i++)
- aAll[nCount+i]=m_aDeprecatedProperties[i];
- }
- if( m_aAdditionalProperties.getLength() )
- {
- sal_Int32 nCount = aAll.getLength();
- aAll.realloc(nCount + m_aAdditionalProperties.getLength());
- for(sal_Int32 i=0;i<m_aAdditionalProperties.getLength();i++)
- aAll[nCount+i]=m_aAdditionalProperties[i];
- }
- return aAll;
-}
- uno::Sequence< beans::PropertyValue > MediaDescriptorHelper
::getReducedForModel()
{
return m_aModelProperties;
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 8fdc05e38006..42943d192c0f 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ModifyListenerHelper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -212,56 +212,5 @@ void SAL_CALL ModifyEventForwarder::disposing()
DisposeAndClear( this );
}
-// ================================================================================
-
-ModifyListenerOnDemmandRefresh::ModifyListenerOnDemmandRefresh( ::osl::Mutex & rMutex )
- : m_rMutex( rMutex ),
- m_bNeedsUpdate( true )
-{
-}
-
-void ModifyListenerOnDemmandRefresh::listenAtDocument(
- const Reference< chart2::XChartDocument > & xModel )
-{
- Reference< util::XModifyBroadcaster > xBroadcaster( xModel, uno::UNO_QUERY );
- if( xBroadcaster.is())
- {
- try
- {
- xBroadcaster->addModifyListener( Reference< util::XModifyListener >( this ));
- }
- catch( const uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
- }
-}
-
-void ModifyListenerOnDemmandRefresh::update()
-{
- m_bNeedsUpdate = false;
-}
-
-bool ModifyListenerOnDemmandRefresh::needsUpdate() const
-{
- return m_bNeedsUpdate;
-}
-
-// ____ XModifyListener ____
-void SAL_CALL ModifyListenerOnDemmandRefresh::modified(
- const lang::EventObject& /* aEvent */ )
- throw (uno::RuntimeException)
-{
- m_bNeedsUpdate = true;
-}
-
-// ____ XEventListener (base of XModifyListener) ____
-void SAL_CALL ModifyListenerOnDemmandRefresh::disposing(
- const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException)
-{
- m_bNeedsUpdate = true;
-}
-
} // namespace ModifyListenerHelper
} // namespace chart
diff --git a/chart2/source/tools/OEnumeration.cxx b/chart2/source/tools/OEnumeration.cxx
index 4db2487b9266..e69de29bb2d1 100644
--- a/chart2/source/tools/OEnumeration.cxx
+++ b/chart2/source/tools/OEnumeration.cxx
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OEnumeration.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "OEnumeration.hxx"
-
-using namespace ::com::sun::star;
-
-namespace comphelper
-{
-
-OEnumeration::OEnumeration(
- const ::std::vector< uno::Any > & rContainer ) :
- m_aContainer( rContainer ),
- m_aIter( m_aContainer.begin() )
-{}
-
-OEnumeration::~OEnumeration()
-{}
-
-sal_Bool SAL_CALL OEnumeration::hasMoreElements()
- throw (uno::RuntimeException)
-{
- return ! m_aContainer.empty();
-}
-
-uno::Any SAL_CALL OEnumeration::nextElement()
- throw (container::NoSuchElementException,
- lang::WrappedTargetException,
- uno::RuntimeException)
-{
- if( m_aIter == m_aContainer.end())
- throw container::NoSuchElementException();
-
- return *m_aIter++;
-}
-
-
-} // namespace comphelper
diff --git a/chart2/source/tools/OIndexContainer.cxx b/chart2/source/tools/OIndexContainer.cxx
index cce7ca539f80..e69de29bb2d1 100644
--- a/chart2/source/tools/OIndexContainer.cxx
+++ b/chart2/source/tools/OIndexContainer.cxx
@@ -1,183 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OIndexContainer.cxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "OIndexContainer.hxx"
-#include <cppuhelper/queryinterface.hxx>
-
-using namespace ::com::sun::star;
-using ::osl::MutexGuard;
-
-namespace comphelper
-{
-
-OIndexContainer::OIndexContainer( ::osl::Mutex & rMutex ) :
- m_rMutex( rMutex )
-{
-}
-
-OIndexContainer::~OIndexContainer()
-{
-}
-
-::osl::Mutex & OIndexContainer::GetMutex()
-{
- return m_rMutex;
-}
-
-// ____ XInterface ____
-uno::Any SAL_CALL OIndexContainer::queryInterface( const uno::Type& aType )
- throw (uno::RuntimeException)
-{
- return ::cppu::queryInterface(
- aType,
- static_cast< container::XIndexContainer * >( this ),
- static_cast< container::XIndexReplace * >( this ),
- static_cast< container::XIndexAccess * >( this ),
- static_cast< container::XElementAccess * >( this ) );
-}
-
-// ____ XIndexContainer ____
-void SAL_CALL OIndexContainer::insertByIndex( sal_Int32 Index, const uno::Any& Element )
- throw (lang::IllegalArgumentException,
- lang::IndexOutOfBoundsException,
- lang::WrappedTargetException,
- uno::RuntimeException)
-{
- // valid range [0..size]
- size_t nIndex( Index );
-
- // /--
- MutexGuard aGuard( GetMutex());
-
- if( Index < 0 ||
- nIndex > m_aContainer.size() )
- throw lang::IndexOutOfBoundsException();
-
- if( getElementType().isAssignableFrom( Element.getValueType()) )
- throw lang::IllegalArgumentException();
-
- if( nIndex == m_aContainer.size())
- m_aContainer.push_back( Element );
- else
- {
- m_aContainer.insert( m_aContainer.begin() + nIndex, Element );
- }
- // \--
-}
-
-void SAL_CALL OIndexContainer::removeByIndex( sal_Int32 Index )
- throw (lang::IndexOutOfBoundsException,
- lang::WrappedTargetException,
- uno::RuntimeException)
-{
- // valid range [0..size-1]
- size_t nIndex( Index );
-
- // /--
- MutexGuard aGuard( GetMutex());
-
- if( Index < 0 ||
- nIndex > m_aContainer.size() )
- throw lang::IndexOutOfBoundsException();
-
- m_aContainer.erase( m_aContainer.begin() + nIndex );
- // \--
-}
-
-
-// ____ XIndexReplace ____
-void SAL_CALL OIndexContainer::replaceByIndex( sal_Int32 Index, const uno::Any& Element )
- throw (lang::IllegalArgumentException,
- lang::IndexOutOfBoundsException,
- lang::WrappedTargetException,
- uno::RuntimeException)
-{
- // valid range [0..size-1]
- size_t nIndex( Index );
-
- // /--
- MutexGuard aGuard( GetMutex());
-
- if( Index < 0 ||
- nIndex > m_aContainer.size() )
- throw lang::IndexOutOfBoundsException();
-
- if( getElementType().isAssignableFrom( Element.getValueType()) )
- throw lang::IllegalArgumentException();
-
- m_aContainer[ nIndex ] = Element;
- // \--
-}
-
-
-// ____ XIndexAccess ____
-sal_Int32 SAL_CALL OIndexContainer::getCount()
- throw (uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex());
-
- return m_aContainer.size();
- // \--
-}
-
-uno::Any SAL_CALL OIndexContainer::getByIndex( sal_Int32 Index )
- throw (lang::IndexOutOfBoundsException,
- lang::WrappedTargetException,
- uno::RuntimeException)
-{
- // valid range [0..size-1]
- size_t nIndex( Index );
-
- // /--
- MutexGuard aGuard( GetMutex());
-
- if( Index < 0 ||
- nIndex > m_aContainer.size() )
- throw lang::IndexOutOfBoundsException();
-
- return m_aContainer.at( nIndex );
- // \--
-}
-
-sal_Bool SAL_CALL OIndexContainer::hasElements()
- throw (uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex());
-
- return ! m_aContainer.empty();
- // \--
-}
-
-
-} // namespace comphelper
diff --git a/chart2/source/tools/OStyle.cxx b/chart2/source/tools/OStyle.cxx
index 76b2b7036668..e69de29bb2d1 100644
--- a/chart2/source/tools/OStyle.cxx
+++ b/chart2/source/tools/OStyle.cxx
@@ -1,233 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: OStyle.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-#include "OStyle.hxx"
-#include "macros.hxx"
-#include <rtl/uuid.h>
-#include <cppuhelper/queryinterface.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-
-using namespace ::com::sun::star;
-
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
-using ::osl::MutexGuard;
-
-namespace property
-{
-
-OStyle::OStyle( const Reference< container::XNameAccess > & xStyleFamily,
- ::osl::Mutex & par_rMutex ) :
- OPropertySet( par_rMutex ),
- m_xStyleFamily( xStyleFamily ),
- m_bUserDefined( false ),
- m_rMutex( par_rMutex )
-{}
-
-OStyle::~OStyle()
-{}
-
-::osl::Mutex & OStyle::GetMutex()
-{
- return m_rMutex;
-}
-
-// ____ XStyle ____
-sal_Bool SAL_CALL OStyle::isUserDefined()
- throw (uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- return m_bUserDefined;
- // \--
-}
-
-sal_Bool SAL_CALL OStyle::isInUse()
- throw (uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
-
- // aBoundLC is a member of cppuhelper::OPropertySetHelper
- // it is assumed that a style is in use whenever some component is
- // registered here as listener
- return ( aBoundLC.getContainedTypes().getLength() > 0 );
- // \--
-}
-
-OUString SAL_CALL OStyle::getParentStyle()
- throw (uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- return m_aParentStyleName;
- // \--
-}
-
-void SAL_CALL OStyle::setParentStyle( const OUString& aParentStyle )
- throw (container::NoSuchElementException,
- uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- m_aParentStyleName = aParentStyle;
- // \--
-}
-
-// ____ XNamed (base of XStyle) ____
-
-OUString SAL_CALL OStyle::getName()
- throw (uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- return m_aName;
- // \--
-}
-
-void SAL_CALL OStyle::setName( const ::rtl::OUString& aName )
- throw (uno::RuntimeException)
-{
- // /--
- MutexGuard aGuard( GetMutex() );
- OSL_ASSERT( m_xStyleFamily.is() );
-
- // note: RuntimeException is not very apropriate for this, but I have no
- // other choice
- if( m_xStyleFamily->hasByName( aName ))
- {
- OSL_ENSURE( false, "Style name already exists!" );
- throw uno::RuntimeException(
- C2U( "Style name already exists: " ) + aName,
- static_cast< style::XStyle * >( this ));
- }
- else
- {
- // ToDo: Change the name in the container (XStyleFamiliy)
- m_aName = aName;
- }
- // \--
-}
-
-// ____ XInterface ____
-uno::Any SAL_CALL OStyle::queryInterface( const uno::Type& aType )
- throw (uno::RuntimeException)
-{
- uno::Any aResult = OPropertySet::queryInterface( aType );
-
- if( ! aResult.hasValue())
- {
- return ::cppu::queryInterface(
- aType,
- static_cast< style::XStyle * >( this ));
- }
-
- return aResult;
-}
-
-// void SAL_CALL OStyle::acquire() throw ()
-// {
-// OPropertySet::acquire();
-// }
-
-// void SAL_CALL OStyle::release() throw ()
-// {
-// OPropertySet::release();
-// }
-
-
-
-// ____ XServiceInfo ____
-// OUString SAL_CALL
-// OStyle::getImplementationName()
-// throw (uno::RuntimeException)
-// {
-// return OUString( RTL_CONSTASCII_USTRINGPARAM( "property::OStyle" ));
-// }
-
-// sal_Bool SAL_CALL
-// OStyle::supportsService( const OUString& ServiceName )
-// throw (uno::RuntimeException)
-// {
-// Sequence< OUString > aServices( getSupportedServiceNames() );
-
-// sal_Int32 nI = aServices.getLength() - 1;
-// for( ; nI >= 0; --nI )
-// {
-// if( aServices[ nI ].equals( ServiceName ))
-// return sal_True;
-// }
-// return sal_False;
-// }
-
-// Sequence< OUString > SAL_CALL
-// OStyle::getSupportedServiceNames()
-// throw (uno::RuntimeException)
-// {
-// Sequence< OUString > aServiceNames( 2 );
-// // from base OPropertySet
-// aServiceNames[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.PropertySet" ));
-// // new service
-// aServiceNames[ 1 ] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.Style" ));
-// return aServiceNames;
-// }
-
-
-// ____ XTypeProvider ____
-// Sequence< uno::Type > SAL_CALL
-// OStyle::getTypes()
-// throw (uno::RuntimeException)
-// {
-// Sequence< uno::Type > aResult( OPropertySet::getTypes() );
-// aResult.realloc( aResult.getLength() + 1 );
-// aResult[ aResult.getLength() - 1 ] =
-// ::getCppuType( reinterpret_cast< const Reference< style::XStyle > *>(0));
-
-// return aResult;
-// }
-
-// Sequence< sal_Int8 > SAL_CALL
-// OStyle::getImplementationId()
-// throw (uno::RuntimeException)
-// {
-// static uno::Sequence< sal_Int8 > aId;
-// if( aId.getLength() == 0 )
-// {
-// aId.realloc( 16 );
-// rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True );
-// }
-// return aId;
-// }
-
-
-} // namespace property
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index db5dd56e59be..57c8ef01d5d6 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ObjectIdentifier.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.24.2 $
*
* This file is part of OpenOffice.org.
*
@@ -254,11 +254,6 @@ void lcl_getDiagramAndCooSys( const OUString& rObjectCID
} //anonymous namespace
-ObjectIdentifier::ObjectIdentifier()
-{
-}
-
-
//static
OUString ObjectIdentifier::createClassifiedIdentifierForObject(
const Reference< uno::XInterface >& xObject
@@ -417,35 +412,6 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
}
//static
-OUString ObjectIdentifier::createParticleForChartType(
- const Reference< XChartType >& xChartType
- , const Reference< frame::XModel >& xChartModel )
-{
- OUStringBuffer aRet;
-
- Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
- Reference< XCoordinateSystem > xCooSys( DiagramHelper::getCoordinateSystemOfChartType( xDiagram, xChartType ) );
- Reference< XChartTypeContainer > xChartTypeContainer( xCooSys, uno::UNO_QUERY );
- if( xChartTypeContainer.is() )
- {
- uno::Sequence< uno::Reference< XChartType > > aChartTypeList( xChartTypeContainer->getChartTypes() );
- for( sal_Int32 nT = 0; nT < aChartTypeList.getLength(); ++nT )
- {
- uno::Reference< XChartType > xCurrentChartType( aChartTypeList[nT] );
- if( xChartType == xCurrentChartType )
- {
- aRet = ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel );
- aRet.appendAscii(":CT=");
- aRet.append( OUString::valueOf( nT ) );
- break;
- }
- }
- }
-
- return aRet.makeStringAndClear();
-}
-
-//static
OUString ObjectIdentifier::createParticleForAxis(
sal_Int32 nDimensionIndex
, sal_Int32 nAxisIndex )
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index fc5e637ce5bb..780a5ba373d9 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: RangeHighlighter.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -69,23 +69,6 @@ void lcl_fillRanges(
}
}
-sal_Int32 lcl_getColor( const Reference< beans::XPropertySet > & xProp )
-{
- sal_Int32 nResult = PREFERED_DEFAULT_COLOR;
-
- try
- {
- if( xProp.is())
- xProp->getPropertyValue( C2U("Color")) >>= nResult;
- }
- catch( const uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
-
- return nResult;
-}
-
} // anonymous namespace
namespace chart
@@ -216,7 +199,6 @@ void RangeHighlighter::fillRangesForDiagram( const Reference< chart2::XDiagram >
void RangeHighlighter::fillRangesForDataSeries( const uno::Reference< chart2::XDataSeries > & xSeries )
{
sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
-// lcl_getColor( Reference< beans::XPropertySet >( xSeries, uno::UNO_QUERY ));
Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY );
if( xSource.is())
lcl_fillRanges( m_aSelectedRanges,
@@ -270,7 +252,6 @@ void RangeHighlighter::fillRangesForCategories( const Reference< chart2::XAxis >
void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface > & xDataSeries, sal_Int32 nIndex )
{
sal_Int32 nPreferredColor = PREFERED_DEFAULT_COLOR;
-// lcl_getColor( Reference< beans::XPropertySet >( xDataPoint, uno::UNO_QUERY ));
if( xDataSeries.is())
{
Reference< chart2::data::XDataSource > xSource( xDataSeries, uno::UNO_QUERY );
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 2f1e9bed1c73..93ba4b43cfc3 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ReferenceSizeProvider.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -37,6 +37,7 @@
#include "DiagramHelper.hxx"
#include "macros.hxx"
#include "AxisHelper.hxx"
+#include "DataSeriesHelper.hxx"
#include <com/sun/star/chart2/XTitled.hpp>
#include <com/sun/star/chart2/XTitle.hpp>
@@ -58,10 +59,8 @@ namespace chart
ReferenceSizeProvider::ReferenceSizeProvider(
awt::Size aPageSize,
- awt::Size aDiagramSize,
const Reference< XChartDocument > & xChartDoc ) :
m_aPageSize( aPageSize ),
- m_aDiagramSize( aDiagramSize ),
m_xChartDoc( xChartDoc ),
m_bUseAutoScale( getAutoResizeState( xChartDoc ) == AUTO_RESIZE_YES )
{}
@@ -71,11 +70,6 @@ awt::Size ReferenceSizeProvider::getPageSize() const
return m_aPageSize;
}
-awt::Size ReferenceSizeProvider::getDiagramSize() const
-{
- return m_aDiagramSize;
-}
-
bool ReferenceSizeProvider::useAutoScale() const
{
return m_bUseAutoScale;
@@ -115,7 +109,7 @@ void ReferenceSizeProvider::setValuesAtTitle(
}
}
- setValuesAtPropertySet( xTitleProp, REF_PAGE, /* bAdaptFontSizes = */ false );
+ setValuesAtPropertySet( xTitleProp, /* bAdaptFontSizes = */ false );
}
catch( const uno::Exception & ex )
{
@@ -145,7 +139,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
{
for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i )
setValuesAtPropertySet(
- (*aIt)->getDataPointByIndex( aPointIndexes[i] ), REF_DIAGRAM );
+ (*aIt)->getDataPointByIndex( aPointIndexes[i] ) );
}
}
catch( const uno::Exception & ex )
@@ -154,26 +148,23 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
}
//it is important to correct the datapoint properties first as they do reference the series properties
- setValuesAtPropertySet( xSeriesProp, REF_DIAGRAM );
+ setValuesAtPropertySet( xSeriesProp );
}
}
}
void ReferenceSizeProvider::setValuesAtPropertySet(
const Reference< beans::XPropertySet > & xProp,
- ReferenceSizeProvider::ReferenceSizeType eType,
bool bAdaptFontSizes /* = true */ )
{
if( ! xProp.is())
return;
- static const OUString aPageRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
- static const OUString aDiaRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferenceDiagramSize"));
+ static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
try
{
- OUString aRefSizeName( (eType == REF_PAGE) ? aPageRefStr : aDiaRefStr );
- awt::Size aRefSize( (eType == REF_PAGE) ? getPageSize() : getDiagramSize() );
+ awt::Size aRefSize( getPageSize() );
awt::Size aOldRefSize;
bool bHasOldRefSize( xProp->getPropertyValue( aRefSizeName ) >>= aOldRefSize );
@@ -202,18 +193,16 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
void ReferenceSizeProvider::getAutoResizeFromPropSet(
const Reference< beans::XPropertySet > & xProp,
- ReferenceSizeProvider::ReferenceSizeType eType,
ReferenceSizeProvider::AutoResizeState & rInOutState )
{
- static const OUString aPageRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
- static const OUString aDiaRefStr( RTL_CONSTASCII_USTRINGPARAM("ReferenceDiagramSize"));
+ static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize"));
AutoResizeState eSingleState = AUTO_RESIZE_UNKNOWN;
if( xProp.is())
{
try
{
- if( xProp->getPropertyValue((eType == REF_PAGE) ? aPageRefStr : aDiaRefStr ).hasValue())
+ if( xProp->getPropertyValue( aRefSizeName ).hasValue())
eSingleState = AUTO_RESIZE_YES;
else
eSingleState = AUTO_RESIZE_NO;
@@ -243,7 +232,7 @@ void ReferenceSizeProvider::getAutoResizeFromTitle(
{
Reference< beans::XPropertySet > xProp( xTitle, uno::UNO_QUERY );
if( xProp.is())
- getAutoResizeFromPropSet( xProp, REF_PAGE, rInOutState );
+ getAutoResizeFromPropSet( xProp, rInOutState );
}
void ReferenceSizeProvider::impl_getAutoResizeFromTitled(
@@ -298,7 +287,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
// Legend
Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY );
if( xLegendProp.is())
- getAutoResizeFromPropSet( xLegendProp, REF_PAGE, eResult );
+ getAutoResizeFromPropSet( xLegendProp, eResult );
if( eResult == AUTO_RESIZE_AMBIGUOUS )
return eResult;
@@ -308,7 +297,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
{
Reference< beans::XPropertySet > xProp( aAxes[i], uno::UNO_QUERY );
if( xProp.is())
- getAutoResizeFromPropSet( xProp, REF_DIAGRAM, eResult );
+ getAutoResizeFromPropSet( xProp, eResult );
Reference< XTitled > xTitled( aAxes[i], uno::UNO_QUERY );
if( xTitled.is())
{
@@ -328,7 +317,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY );
if( xSeriesProp.is())
{
- getAutoResizeFromPropSet( xSeriesProp, REF_DIAGRAM, eResult );
+ getAutoResizeFromPropSet( xSeriesProp, eResult );
if( eResult == AUTO_RESIZE_AMBIGUOUS )
return eResult;
@@ -341,8 +330,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
for( sal_Int32 i=0; i< aPointIndexes.getLength(); ++i )
{
getAutoResizeFromPropSet(
- (*aIt)->getDataPointByIndex( aPointIndexes[i] ),
- REF_DIAGRAM, eResult );
+ (*aIt)->getDataPointByIndex( aPointIndexes[i] ), eResult );
if( eResult == AUTO_RESIZE_AMBIGUOUS )
return eResult;
}
@@ -385,7 +373,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz
// Legend
Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY );
if( xLegendProp.is())
- setValuesAtPropertySet( xLegendProp, REF_PAGE );
+ setValuesAtPropertySet( xLegendProp );
// Axes (incl. Axis Titles)
Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) );
@@ -393,7 +381,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz
{
Reference< beans::XPropertySet > xProp( aAxes[i], uno::UNO_QUERY );
if( xProp.is())
- setValuesAtPropertySet( xProp, REF_DIAGRAM );
+ setValuesAtPropertySet( xProp );
impl_setValuesAtTitled( Reference< XTitled >( aAxes[i], uno::UNO_QUERY ));
}
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 9372bee0d14a..7686b2c7009d 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: RegressionCurveHelper.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.16.1 $
*
* This file is part of OpenOffice.org.
*
@@ -138,12 +138,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
// ------------------------------------------------------------
// static
-Reference< XRegressionCurveCalculator > RegressionCurveHelper::createMeanValueLineCalculator()
-{
- return Reference< XRegressionCurveCalculator >( new MeanValueRegressionCurveCalculator());
-}
-
-// static
Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName(
::rtl::OUString aServiceName )
{
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 48a33bf00b6d..24e55ccfc90e 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: TitleHelper.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -46,56 +46,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-namespace
-{
-
-rtl::OUString lcl_getIdentifierForTitle( TitleHelper::eTitleType nTitleIndex )
-{
- switch( nTitleIndex )
- {
- case TitleHelper::MAIN_TITLE:
- {
- static rtl::OUString m_aIdentifier( C2U( "@main-title" ) );
- return m_aIdentifier;
- }
- case TitleHelper::SUB_TITLE:
- {
- static rtl::OUString m_aIdentifier( C2U( "@sub-title" ) );
- return m_aIdentifier;
- }
- case TitleHelper::X_AXIS_TITLE:
- {
- static rtl::OUString m_aIdentifier( C2U( "@xaxis-title" ) );
- return m_aIdentifier;
- }
- case TitleHelper::Y_AXIS_TITLE:
- {
- static rtl::OUString m_aIdentifier( C2U( "@yaxis-title" ) );
- return m_aIdentifier;
- }
- case TitleHelper::Z_AXIS_TITLE:
- {
- static rtl::OUString m_aIdentifier( C2U( "@zaxis-title" ) );
- return m_aIdentifier;
- }
- case TitleHelper::SECONDARY_X_AXIS_TITLE:
- {
- static rtl::OUString m_aIdentifier( C2U( "@secondaryxaxis-title" ) );
- return m_aIdentifier;
- }
- case TitleHelper::SECONDARY_Y_AXIS_TITLE:
- {
- static rtl::OUString m_aIdentifier( C2U( "@secondaryyaxis-title" ) );
- return m_aIdentifier;
- }
- default:
- OSL_ENSURE( false, "Unsupported Title-Type requested" );
- return ::rtl::OUString();
- }
-}
-
-} //anonymous namespace
-
uno::Reference< XTitled > lcl_getTitleParentFromDiagram(
TitleHelper::eTitleType nTitleIndex
, const uno::Reference< XDiagram >& xDiagram )
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index 37906d77b6a0..8f3d732ec877 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: WeakListenerAdapter.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -43,11 +43,6 @@ namespace chart
{
WeakModifyListenerAdapter::WeakModifyListenerAdapter(
- const Reference< util::XModifyListener > & xListener ) :
- WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener )
-{}
-
-WeakModifyListenerAdapter::WeakModifyListenerAdapter(
const uno::WeakReference< util::XModifyListener > & xListener ) :
WeakListenerAdapter< ::com::sun::star::util::XModifyListener >( xListener )
{}
@@ -70,11 +65,6 @@ WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter(
WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener )
{}
-WeakSelectionChangeListenerAdapter::WeakSelectionChangeListenerAdapter(
- const uno::WeakReference< view::XSelectionChangeListener > & xListener ) :
- WeakListenerAdapter< ::com::sun::star::view::XSelectionChangeListener >( xListener )
-{}
-
WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter()
{}
diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk
index ef78453194c8..a6e05c8e9a68 100644
--- a/chart2/source/tools/makefile.mk
+++ b/chart2/source/tools/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.28 $
+# $Revision: 1.28.42.2 $
#
# This file is part of OpenOffice.org.
#
@@ -59,7 +59,6 @@ SLOFILES= \
$(SLO)$/ObjectIdentifier.obj \
$(SLO)$/CachedDataSequence.obj \
$(SLO)$/CommonConverters.obj \
- $(SLO)$/ContextHelper.obj \
$(SLO)$/DataSeriesHelper.obj \
$(SLO)$/DataSource.obj \
$(SLO)$/DataSourceHelper.obj \
@@ -71,15 +70,12 @@ SLOFILES= \
$(SLO)$/LinearRegressionCurveCalculator.obj \
$(SLO)$/LogarithmicRegressionCurveCalculator.obj \
$(SLO)$/MeanValueRegressionCurveCalculator.obj \
- $(SLO)$/OEnumeration.obj \
- $(SLO)$/OIndexContainer.obj \
$(SLO)$/OPropertySet.obj \
$(SLO)$/WrappedPropertySet.obj \
$(SLO)$/WrappedProperty.obj \
$(SLO)$/WrappedIgnoreProperty.obj \
$(SLO)$/WrappedDefaultProperty.obj \
$(SLO)$/WrappedDirectStateProperty.obj \
- $(SLO)$/OStyle.obj \
$(SLO)$/PotentialRegressionCurveCalculator.obj \
$(SLO)$/RegressionCurveHelper.obj \
$(SLO)$/RegressionCurveModel.obj \
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 9f24b193276e..29e4fc0d06da 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ScaleAutomatism.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.24.1 $
*
* This file is part of OpenOffice.org.
*
@@ -185,6 +185,11 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
}
}
+ScaleData ScaleAutomatism::getScale() const
+{
+ return m_aSourceScale;
+}
+
// private --------------------------------------------------------------------
void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx
index 3202b6311476..25de4dc61864 100644
--- a/chart2/source/view/axes/TickmarkHelper.cxx
+++ b/chart2/source/view/axes/TickmarkHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: TickmarkHelper.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -344,11 +344,6 @@ double TickmarkHelper::getMaximumAtIncrement( double fMax, const ExplicitIncreme
return fRet;
}
-double TickmarkHelper::getScaledWidth() const
-{
- return m_fScaledVisibleMax - m_fScaledVisibleMin;
-}
-
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -557,20 +552,6 @@ bool TickmarkHelper::isVisible( double fScaledValue ) const
return true;
}
-bool TickmarkHelper::isPostEquidistant( sal_Int32 nDepth ) const
-{
- if( nDepth<0 || nDepth>m_rIncrement.SubIncrements.getLength() )
- {
- DBG_ERROR("invalid depth for tickmark");
- return true;
- }
-
- if( nDepth==0 )
- return m_rIncrement.PostEquidistant;
-
- return m_rIncrement.SubIncrements[nDepth-1].PostEquidistant;
-}
-
void TickmarkHelper::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const
{
uno::Sequence< uno::Sequence< double > > aAllTicks;
diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/TickmarkHelper.hxx
index 4e758aa0ceb5..287635ee9487 100644
--- a/chart2/source/view/axes/TickmarkHelper.hxx
+++ b/chart2/source/view/axes/TickmarkHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: TickmarkHelper.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.24.1 $
*
* This file is part of OpenOffice.org.
*
@@ -156,14 +156,11 @@ public:
void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const;
- bool isPostEquidistant( sal_Int32 nDepth ) const;
//
static double getMinimumAtIncrement( double fMin, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
static double getMaximumAtIncrement( double fMax, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement );
- double getScaledWidth() const;
-
protected: //methods
void addSubTicks( sal_Int32 nDepth,
::com::sun::star::uno::Sequence<
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index b152210134ea..6e43ebc75b67 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VCoordinateSystem.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.36.1 $
*
* This file is part of OpenOffice.org.
*
@@ -333,23 +333,6 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens
return aRet;
}
-sal_Int32 VCoordinateSystem::getMaximumIncrementIndexByDimension( sal_Int32 nDimensionIndex ) const
-{
- sal_Int32 nRet = 0;
- tFullExplicitIncrementMap::const_iterator aIt = m_aSecondaryExplicitIncrements.begin();
- tFullExplicitIncrementMap::const_iterator aEnd = m_aSecondaryExplicitIncrements.end();
- for(; aIt!=aEnd; ++aIt)
- {
- if(aIt->first.first==nDimensionIndex)
- {
- sal_Int32 nLocalIdx = aIt->first.second;
- if( nRet < nLocalIdx )
- nRet = nLocalIdx;
- }
- }
- return nRet;
-}
-
rtl::OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
{
rtl::OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) );
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 770f8791f372..f9278b94b245 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VPolarGrid.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -117,7 +117,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
else
rPoints[0].realloc(0);
}
-
+#ifdef NOTYET
void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget
, ::std::vector< ::std::vector< TickInfo > >& /* rRadiusTickInfos */
, ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
@@ -176,6 +176,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") );
}
}
+#endif
void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget
, ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 672b7da09c5c..74cd7fac27ed 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VPolarGrid.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -85,10 +85,12 @@ private: //member
, ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
, ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
, const ::std::vector<VLineProperties>& rLinePropertiesList );
+#if NOTYET
void create2DAngleGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget
, ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos
, ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos
, const ::std::vector<VLineProperties>& rLinePropertiesList );
+#endif
};
//.............................................................................
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 1bc61f8ca0e8..1401ab43a159 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AreaChart.cxx,v $
- * $Revision: 1.54 $
+ * $Revision: 1.53.42.2 $
*
* This file is part of OpenOffice.org.
*
@@ -862,15 +862,7 @@ void AreaChart::createShapes()
drawing::Direction3D aSymbolSize(0,0,0);
if( bCreateSymbol )
{
- if(m_nDimension==3)
- {
- /* //no symbols for 3D
- m_pShapeFactory->createSymbol3D( xPointGroupShape_Shapes
- , aScenePosition, aTransformedGeom.m_aSize
- , (*aSeriesIter)->getSymbolTypeOfPoint( nIndex ) );
- */
- }
- else //m_nDimension!=3
+ if(m_nDimension!=3)
{
if( pSymbolProperties )
{
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 4afa853b702f..2a42c3ab87ce 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: CategoryPositionHelper.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -56,14 +56,6 @@ CategoryPositionHelper::CategoryPositionHelper( const CategoryPositionHelper& rS
{
}
-CategoryPositionHelper::CategoryPositionHelper()
- : m_fSeriesCount(1.0)
- , m_fCategoryWidth(1.0)
- , m_fInnerDistance(0.0)
- , m_fOuterDistance(0.0)
-{
-}
-
CategoryPositionHelper::~CategoryPositionHelper()
{
}
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
index fa59bfa14169..dea85190d528 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: CategoryPositionHelper.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -45,7 +45,6 @@ class CategoryPositionHelper
public:
CategoryPositionHelper( double fSeriesCount, double CategoryWidth = 1.0);
CategoryPositionHelper( const CategoryPositionHelper& rSource );
- CategoryPositionHelper();
virtual ~CategoryPositionHelper();
double getSlotWidth() const;
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 7266c4d931a2..774ea4dd5815 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: PieChart.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -197,13 +197,6 @@ APPHELPER_XSERVICEINFO_IMPL(PieChart,CHART2_VIEW_PIECHART_SERVICE_IMPLEMENTATION
}
*/
-bool PieChart::isSingleRingChart() const
-{
- if( m_aZSlots.size() == 1 && m_aZSlots[0].size() ==1 )
- return true;
- return !m_bUseRings;
-}
-
uno::Reference< drawing::XShape > PieChart::createDataPoint(
const uno::Reference< drawing::XShapes >& xTarget
, const uno::Reference< beans::XPropertySet >& xObjectProperties
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index 51e1ded6d9fc..e65cfdcc5626 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: PieChart.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -105,7 +105,6 @@ private: //methods
, double fLogicZ, double fDepth, double fExplodePercentage
, tPropertyNameValueMap* pOverWritePropertiesMap );
- bool isSingleRingChart() const;
double getMaxOffset() const;
bool detectLabelOverlapsAndMove(const ::com::sun::star::awt::Size& rPageSize);//returns true when there might be more to do
void resetLabelPositionsToPreviousState();
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 2266d72d7370..a684b9a3228e 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Splines.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -62,95 +62,6 @@ struct lcl_EqualsFirstDoubleOfPair : ::std::binary_function< ::std::pair< double
//-----------------------------------------------------------------------------
-struct Point3D
-{
- Point3D( double X, double Y, double Z );
- Point3D();
-
- double X;
- double Y;
- double Z;
-};
-Point3D::Point3D( double fX, double fY, double fZ )
-: X(fX), Y(fY), Z(fZ)
-{
-}
-Point3D::Point3D()
-: X(0.0), Y(0.0), Z(0.0)
-{
-}
-
-typedef ::std::vector< Point3D > t3DPointVecType;
-
-
-struct lcl_LessXOfPoint3D : ::std::binary_function< Point3D, Point3D, bool >
-{
- inline bool operator() ( const Point3D& rOne, const Point3D& rOther )
- {
- return ( rOne.X < rOther.X );
- }
-};
-
-t3DPointVecType lcl_makeVector3D( const drawing::PolyPolygonShape3D& rPoly, sal_Int32 nPolyIndex=0 )
-{
- t3DPointVecType aRet;
- if(nPolyIndex>=0&&nPolyIndex<rPoly.SequenceX.getLength())
- {
- sal_Int32 nPointCount = rPoly.SequenceX[nPolyIndex].getLength();
- if(nPointCount)
- {
- const double* pXSequence = rPoly.SequenceX[nPolyIndex].getConstArray();
- const double* pYSequence = rPoly.SequenceY[nPolyIndex].getConstArray();
- const double* pZSequence = rPoly.SequenceZ[nPolyIndex].getConstArray();
- aRet.resize(nPointCount);
- for(sal_Int32 nN=0;nN<nPointCount;nN++)
- {
- aRet[ nN ].X = pXSequence[nN];
- aRet[ nN ].Y = pYSequence[nN];
- aRet[ nN ].Z = pZSequence[nN];
- }
- }
- }
- return aRet;
-}
-
-void lcl_makePolygonFromVector3D( const t3DPointVecType& rVector, drawing::PolyPolygonShape3D& rPoly )
-{
- sal_Int32 nPointCount = static_cast<sal_Int32>(rVector.size());
-
- rPoly.SequenceX.realloc(1);
- rPoly.SequenceY.realloc(1);
- rPoly.SequenceZ.realloc(1);
- rPoly.SequenceX[0].realloc( nPointCount );
- rPoly.SequenceY[0].realloc( nPointCount );
- rPoly.SequenceZ[0].realloc( nPointCount );
-
- if(!nPointCount)
- return;
-
- double* pXSequence = rPoly.SequenceX[0].getArray();
- double* pYSequence = rPoly.SequenceY[0].getArray();
- double* pZSequence = rPoly.SequenceZ[0].getArray();
-
- for(sal_Int32 nN=0;nN<nPointCount;nN++)
- {
- Point3D aP = rVector[nN];
- pXSequence[nN] = aP.X;
- pYSequence[nN] = aP.Y;
- pZSequence[nN] = aP.Z;
- }
-}
-
-void lcl_getSortedPolyPolygonShape3D( const drawing::PolyPolygonShape3D& rUnsortedInput, drawing::PolyPolygonShape3D& rSortedOutput )
-{
-
- t3DPointVecType aVector = lcl_makeVector3D( rUnsortedInput);
- ::std::sort( aVector.begin(), aVector.end(), lcl_LessXOfPoint3D() );
- lcl_makePolygonFromVector3D( aVector, rSortedOutput );
-}
-
-//-----------------------------------------------------------------------------
-
typedef ::std::pair< double, double > tPointType;
typedef ::std::vector< tPointType > tPointVecType;
typedef tPointVecType::size_type lcl_tSizeType;
@@ -344,30 +255,6 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x )
( h*h ) / 6.0 );
}
-tPointVecType makeVector( const drawing::PolyPolygonShape3D& rPoly, sal_Int32 nPolyIndex=0 )
-{
- //creates a vector from only one poly within the PolyPolygon
- //the third dimension is ignored (3D->2D)
-
- tPointVecType aRet;
- if(nPolyIndex>=0&&nPolyIndex<rPoly.SequenceX.getLength())
- {
- sal_Int32 nPointCount = rPoly.SequenceX[nPolyIndex].getLength();
- if(nPointCount)
- {
- const double* pXSequence = rPoly.SequenceX[nPolyIndex].getConstArray();
- const double* pYSequence = rPoly.SequenceY[nPolyIndex].getConstArray();
- aRet.resize(nPointCount);
- for(sal_Int32 nN=0;nN<nPointCount;nN++)
- {
- aRet[ nN ].first = pXSequence[nN];
- aRet[ nN ].second = pYSequence[nN];
- }
- }
- }
- return aRet;
-}
-
//-----------------------------------------------------------------------------
//create knot vector for B-spline
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index ffb9484cd09c..1f37ae7c3aea 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VSeriesPlotter.cxx,v $
- * $Revision: 1.44 $
+ * $Revision: 1.44.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1693,15 +1693,15 @@ uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const
namespace
{
-struct lcl_setDiaRefSizeAtSeriesGroup : public ::std::unary_function< VDataSeriesGroup, void >
+struct lcl_setRefSizeAtSeriesGroup : public ::std::unary_function< VDataSeriesGroup, void >
{
- lcl_setDiaRefSizeAtSeriesGroup( awt::Size aRefSize ) : m_aRefSize( aRefSize ) {}
+ lcl_setRefSizeAtSeriesGroup( awt::Size aRefSize ) : m_aRefSize( aRefSize ) {}
void operator()( VDataSeriesGroup & rGroup )
{
::std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin());
const ::std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end());
for( ; aIt != aEndIt; ++aIt )
- (*aIt)->setDiagramReferenceSize( m_aRefSize );
+ (*aIt)->setPageReferenceSize( m_aRefSize );
}
private:
@@ -1709,20 +1709,15 @@ private:
};
} // anonymous namespace
-void VSeriesPlotter::setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize )
+void VSeriesPlotter::setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize )
{
- m_aDiagramReferenceSize = rDiagramRefSize;
+ m_aPageReferenceSize = rPageRefSize;
// set reference size also at all data series
::std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots ));
::std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(),
- lcl_setDiaRefSizeAtSeriesGroup( m_aDiagramReferenceSize ));
-}
-
-void VSeriesPlotter::setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize )
-{
- m_aPageReferenceSize = rPageRefSize;
+ lcl_setRefSizeAtSeriesGroup( m_aPageReferenceSize ));
}
//better performance for big data
diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx
index 0023e0434655..8b14869aa773 100644
--- a/chart2/source/view/inc/LabelPositionHelper.hxx
+++ b/chart2/source/view/inc/LabelPositionHelper.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: LabelPositionHelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,8 +60,6 @@ public:
::com::sun::star::awt::Point transformSceneToScreenPosition(
const ::com::sun::star::drawing::Position3D& rScenePosition3D ) const;
- ::com::sun::star::awt::Point transformScaledLogicToScreenPosition(
- const ::com::sun::star::drawing::Position3D& rScenePosition3D ) const;
static void changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence& rPropNames, LabelAlignment eAlignment);
static void doDynamicFontResize( tAnySequence& rPropValues, const tNameSequence& rPropNames
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx
index a286f31d3bcd..bd16fbab4eb4 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ScaleAutomatism.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -83,6 +83,8 @@ public:
::com::sun::star::chart2::ExplicitScaleData& rExplicitScale,
::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ) const;
+ ::com::sun::star::chart2::ScaleData getScale() const;
+
private:
/** Fills the passed scale data and increment data for category scaling. */
void calculateExplicitIncrementAndScaleForCategory(
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index 1297d2e4385a..63a7c7558a5b 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ShapeFactory.hxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -150,14 +150,6 @@ public:
, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic );
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- createSymbol3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget
- , const ::com::sun::star::drawing::Position3D& rPos
- , const ::com::sun::star::drawing::Direction3D& rSize
- , sal_Int32 nStandardSymbol
- , sal_Int32 nBorderColor=0
- , sal_Int32 nFillColor=0 );
-
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget
, const ::com::sun::star::drawing::PointSequenceSequence& rPoints
, const VLineProperties* pLineProperties = NULL );
diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx
index c90968294a98..fe3a728daa02 100644
--- a/chart2/source/view/inc/Stripe.hxx
+++ b/chart2/source/view/inc/Stripe.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Stripe.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -72,8 +72,6 @@ public:
::com::sun::star::drawing::Position3D GetPosition3() const { return m_aPoint3; }
::com::sun::star::drawing::Position3D GetPosition4() const { return m_aPoint4; }
- ::com::sun::star::drawing::Direction3D GetDirectionTo4() const;
-
private:
::com::sun::star::drawing::Position3D m_aPoint1;
::com::sun::star::drawing::Position3D m_aPoint2;
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index b183e02cfb4e..f9a575be0123 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VCoordinateSystem.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.36.1 $
*
* This file is part of OpenOffice.org.
*
@@ -146,8 +146,6 @@ protected: //methods
void prepareScaleAutomatism( ScaleAutomatism& rScaleAutomatism, double fMin, double fMax, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
- sal_Int32 getMaximumIncrementIndexByDimension( sal_Int32 nDimensionIndex ) const;
-
rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis >& xAxis
, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index a7437db88d2e..d3f14a9a1bdd 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VDataSeries.hxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.21.8.2 $
*
* This file is part of OpenOffice.org.
*
@@ -86,7 +86,7 @@ public:
void setCategoryXAxis();
void setParticle( const rtl::OUString& rSeriesParticle );
void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
- void setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize );
+ void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
sal_Int32 getTotalPointCount() const;
double getX( sal_Int32 index ) const;
diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx
index f1e8b7189d94..321c171223ea 100644
--- a/chart2/source/view/inc/VLegendSymbolFactory.hxx
+++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VLegendSymbolFactory.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -63,18 +63,6 @@ public:
tPropertyType ePropertyType,
const ::com::sun::star::uno::Any& rExplicitSymbol /*should contain a ::com::sun::star::chart2::Symbol without automatic symbol if the charttype does support symbols else empty*/);
- /// @param bWhiteDay: if <FALSE/> this symbol is for BlackDays
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape >
- createJapaneseCandleStickSymbol(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes > xSymbolContainer,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > & xShapeFactory,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties,
- bool bWhiteDay );
-
enum tStockLineType
{
STOCK_LINE_TYPE_VERT,
@@ -82,17 +70,6 @@ public:
STOCK_LINE_TYPE_CLOSE
};
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape >
- createStockLineSymbol(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes > xSymbolContainer,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > & xShapeFactory,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties,
- tStockLineType eType );
-
private:
VLegendSymbolFactory();
};
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 27671de5f7f2..b5ea7f7c2bfd 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VSeriesPlotter.hxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.8.1 $
*
* This file is part of OpenOffice.org.
*
@@ -285,8 +285,6 @@ public:
//get series names for the z axis labels
::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const;
- void setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize );
-
void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
//better performance for big data
void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution );
@@ -448,7 +446,6 @@ private: //member
typedef std::map< sal_Int32 , PlottingPositionHelper* > tSecondaryPosHelperMap;
mutable tSecondaryPosHelperMap m_aSecondaryPosHelperMap;
- ::com::sun::star::awt::Size m_aDiagramReferenceSize;
::com::sun::star::awt::Size m_aPageReferenceSize;
};
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index c14aa06456f3..fcae915faa51 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartItemPool.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.9.42.2 $
*
* This file is part of OpenOffice.org.
*
@@ -68,13 +68,6 @@ struct ChartItemPoolInitialization
namespace chart
{
-ChartItemPool * GetChartItemPool()
-{
- return rtl_Instance< ChartItemPool, ChartItemPoolInitialization, ::osl::MutexGuard,
- ::osl::GetGlobalMutex >::create(
- ChartItemPoolInitialization(), ::osl::GetGlobalMutex());
-}
-
ChartItemPool::ChartItemPool():
SfxItemPool( String( RTL_CONSTASCII_USTRINGPARAM( "ChartItemPool" )), SCHATTR_START, SCHATTR_END, NULL, NULL )
{
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index dbc51e4fabe1..98d52b30b374 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartItemPool.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -53,10 +53,6 @@ public:
static SfxItemPool* CreateChartItemPool();
};
-/** global function to get a singleton ChartItemPool
- */
-ChartItemPool * GetChartItemPool();
-
} // namespace chart
#endif
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index b17a3b5337cf..28be0740d23d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ChartView.cxx,v $
- * $Revision: 1.47 $
+ * $Revision: 1.46.22.5 $
*
* This file is part of OpenOffice.org.
*
@@ -551,17 +551,18 @@ public:
void initializeCooSysAndSeriesPlotter( const uno::Reference< frame::XModel >& xChartModel );
void initAxisUsageList();
- void doAutoScaling();
+ void doAutoScaling( const uno::Reference< frame::XModel >& xChartModel );
void updateScalesAndIncrementsOnAxes();
void setScalesFromCooSysToPlotter();
void setNumberFormatsFromAxes();
drawing::Direction3D getPreferredAspectRatio();
- bool shouldKeep2DAspectRatio();
std::vector< VSeriesPlotter* >& getSeriesPlotterList() { return m_aSeriesPlotterList; }
std::vector< VCoordinateSystem* >& getCooSysList() { return m_rVCooSysList; }
std::vector< LegendEntryProvider* > getLegendEntryProviderList();
+ void AdaptScaleOfYAxisWithoutAttachedSeries( const uno::Reference< frame::XModel >& xChartModel );
+
private:
std::vector< VSeriesPlotter* > m_aSeriesPlotterList;
std::vector< VCoordinateSystem* >& m_rVCooSysList;
@@ -882,7 +883,7 @@ void SeriesPlotterContainer::updateScalesAndIncrementsOnAxes()
m_rVCooSysList[nC]->updateScalesAndIncrementsOnAxes();
}
-void SeriesPlotterContainer::doAutoScaling()
+void SeriesPlotterContainer::doAutoScaling( const uno::Reference< frame::XModel >& xChartModel )
{
//precondition: need a initialized m_aSeriesPlotterList
//precondition: need a initialized m_aAxisUsageList
@@ -947,6 +948,109 @@ void SeriesPlotterContainer::doAutoScaling()
aVCooSysList_Z[nC]->setExplicitScaleAndIncrement( 2, nAxisIndex, aExplicitScale, aExplicitIncrement );
}
}
+ AdaptScaleOfYAxisWithoutAttachedSeries( xChartModel );
+}
+
+void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( const uno::Reference< frame::XModel >& xChartModel )
+{
+ //issue #i80518#
+
+ ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
+ const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
+
+ for( sal_Int32 nAxisIndex=0; nAxisIndex<=m_nMaxAxisIndex; nAxisIndex++ )
+ {
+ for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; aAxisIter++ )
+ {
+ AxisUsage& rAxisUsage = (*aAxisIter).second;
+ ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex );
+ if( !aVCooSysList_Y.size() )
+ continue;
+
+ uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
+ if( xDiagram.is() )
+ {
+ bool bSeriesAttachedToThisAxis = false;
+ sal_Int32 nAttachedAxisIndex = -1;
+ {
+ ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
+ for( ; aIter != aSeriesVector.end(); aIter++ )
+ {
+ sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
+ if( nAxisIndex == nCurrentIndex )
+ {
+ bSeriesAttachedToThisAxis = true;
+ break;
+ }
+ else if( nAttachedAxisIndex<0 || nAttachedAxisIndex>nCurrentIndex )
+ nAttachedAxisIndex=nCurrentIndex;
+ }
+ }
+
+ if( !bSeriesAttachedToThisAxis && nAttachedAxisIndex >= 0 )
+ {
+ for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC )
+ {
+ aVCooSysList_Y[nC]->prepareScaleAutomatismForDimensionAndIndex( rAxisUsage.aScaleAutomatism, 1, nAttachedAxisIndex );
+
+ ExplicitScaleData aExplicitScaleSource = aVCooSysList_Y[nC]->getExplicitScale( 1,nAttachedAxisIndex );
+ ExplicitIncrementData aExplicitIncrementSource = aVCooSysList_Y[nC]->getExplicitIncrement( 1,nAttachedAxisIndex );
+
+ ExplicitScaleData aExplicitScaleDest = aVCooSysList_Y[nC]->getExplicitScale( 1,nAxisIndex );;
+ ExplicitIncrementData aExplicitIncrementDest = aVCooSysList_Y[nC]->getExplicitIncrement( 1,nAxisIndex );;
+
+ aExplicitScaleDest.Orientation = aExplicitScaleSource.Orientation;
+ aExplicitScaleDest.Scaling = aExplicitScaleSource.Scaling;
+ aExplicitScaleDest.Breaks = aExplicitScaleSource.Breaks;
+ aExplicitScaleDest.AxisType = aExplicitScaleSource.AxisType;
+
+ aExplicitIncrementDest.BaseValue = aExplicitIncrementSource.BaseValue;
+
+ ScaleData aScale( rAxisUsage.aScaleAutomatism.getScale() );
+ if( !aScale.Minimum.hasValue() )
+ {
+ bool bNewMinOK = true;
+ double fMax=0.0;
+ if( aScale.Maximum >>= fMax )
+ bNewMinOK = (aExplicitScaleSource.Minimum <= fMax);
+ if( bNewMinOK )
+ aExplicitScaleDest.Minimum = aExplicitScaleSource.Minimum;
+ }
+ else
+ aExplicitIncrementDest.BaseValue = aExplicitScaleDest.Minimum;
+
+ if( !aScale.Maximum.hasValue() )
+ {
+ bool bNewMaxOK = true;
+ double fMin=0.0;
+ if( aScale.Minimum >>= fMin )
+ bNewMaxOK = (fMin <= aExplicitScaleSource.Maximum);
+ if( bNewMaxOK )
+ aExplicitScaleDest.Maximum = aExplicitScaleSource.Maximum;
+ }
+ if( !aScale.Origin.hasValue() )
+ aExplicitScaleDest.Origin = aExplicitScaleSource.Origin;
+
+ if( !aScale.IncrementData.Distance.hasValue() )
+ aExplicitIncrementDest.Distance = aExplicitIncrementSource.Distance;
+
+ bool bAutoMinorInterval = true;
+ if( aScale.IncrementData.SubIncrements.getLength() )
+ bAutoMinorInterval = !( aScale.IncrementData.SubIncrements[0].IntervalCount.hasValue() );
+ if( bAutoMinorInterval )
+ {
+ if( aExplicitIncrementDest.SubIncrements.getLength() && aExplicitIncrementSource.SubIncrements.getLength() )
+ aExplicitIncrementDest.SubIncrements[0].IntervalCount =
+ aExplicitIncrementSource.SubIncrements[0].IntervalCount;
+ }
+
+ aVCooSysList_Y[nC]->setExplicitScaleAndIncrement( 1, nAxisIndex, aExplicitScaleDest, aExplicitIncrementDest );
+ }
+ }
+ }
+ }
+ }
}
drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
@@ -994,22 +1098,6 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio()
return aPreferredAspectRatio;
}
-bool SeriesPlotterContainer::shouldKeep2DAspectRatio()
-{
- bool bOutKeep2DAspectRatio = false;
-
- //detect wether the aspect ratio needs to be kept
- ::std::vector< VSeriesPlotter* >::const_iterator aPlotterIter = m_aSeriesPlotterList.begin();
- const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = m_aSeriesPlotterList.end();
- for( aPlotterIter = m_aSeriesPlotterList.begin()
- ; aPlotterIter != aPlotterEnd; aPlotterIter++ )
- {
- bOutKeep2DAspectRatio = bOutKeep2DAspectRatio || (*aPlotterIter)->keepAspectRatio();
- }
-
- return bOutKeep2DAspectRatio;
-}
-
//-----------------------------------------------------
namespace
@@ -1065,7 +1153,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
pVCooSys->set3DWallPositions( eLeftWallPos, eBackWallPos, eBottomPos );
}
pVCooSys->createVAxisList( xNumberFormatsSupplier
- , rAvailableSize //font reference size
+ , rPageSize //font reference size
, BaseGFXHelper::B2IRectangleToAWTRectangle( aAvailableOuterRect ) //maximum space for labels
);
}
@@ -1073,7 +1161,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
// - prepare list of all axis and how they are used
rSeriesPlotterContainer.initAxisUsageList();
- rSeriesPlotterContainer.doAutoScaling();
+ rSeriesPlotterContainer.doAutoScaling( m_xChartModel );
rSeriesPlotterContainer.setScalesFromCooSysToPlotter();
rSeriesPlotterContainer.setNumberFormatsFromAxes();
@@ -1084,7 +1172,6 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
//aspect ratio
drawing::Direction3D aPreferredAspectRatio(
rSeriesPlotterContainer.getPreferredAspectRatio() );
-// bool bKeepAspectRatio = rSeriesPlotterContainer.shouldKeep2DAspectRatio();
uno::Reference< drawing::XShapes > xCoordinateRegionTarget(0);
VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount);
@@ -1131,7 +1218,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
createTransformationSceneToScreen( aNewInnerRect ) ));
//redo autoscaling to get size and text dependent automatic main increment count
- rSeriesPlotterContainer.doAutoScaling();
+ rSeriesPlotterContainer.doAutoScaling( m_xChartModel );
rSeriesPlotterContainer.updateScalesAndIncrementsOnAxes();
rSeriesPlotterContainer.setScalesFromCooSysToPlotter();
@@ -1177,10 +1264,9 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
{
//------------ set transformation to plotter / create series
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
- pSeriesPlotter->setPageReferenceSize( rPageSize );
rtl::OUString aCID; //III
pSeriesPlotter->initPlotter(xCoordinateRegionTarget,xTextTargetShapes,m_xShapeFactory,aCID);
- pSeriesPlotter->setDiagramReferenceSize( rAvailableSize );
+ pSeriesPlotter->setPageReferenceSize( rPageSize );
VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( rVCooSysList, pSeriesPlotter );
if(2==nDimensionCount)
pSeriesPlotter->setTransformationSceneToScreen( pVCooSys->getTransformationSceneToScreen() );
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 3fba99fe2f76..b5bf518770fa 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: LabelPositionHelper.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.44.2 $
*
* This file is part of OpenOffice.org.
*
@@ -70,22 +70,6 @@ awt::Point LabelPositionHelper::transformSceneToScreenPosition( const drawing::P
rScenePosition3D, m_xLogicTarget, m_pShapeFactory, m_nDimensionCount );
}
-awt::Point LabelPositionHelper::transformScaledLogicToScreenPosition( const drawing::Position3D& rLogicPosition3D ) const
-{
- drawing::Position3D aScenePosition3D( SequenceToPosition3D(
- m_pPosHelper->getTransformationScaledLogicToScene()->transform(
- Position3DToSequence(rLogicPosition3D) ) ) );
- /*
- if(3==m_nDimensionCount)
- {
- drawing::Position3D aScenePosition3D_rotated( aScenePosition3D.PositionX, -aScenePosition3D.PositionZ, aScenePosition3D.PositionY );
- aScenePosition3D = aScenePosition3D_rotated;
- }
- */
- awt::Point aScreenPosition2D( this->transformSceneToScreenPosition( aScenePosition3D ) );
- return aScreenPosition2D;
-}
-
//static
void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence& rPropNames, LabelAlignment eAlignment)
{
@@ -136,7 +120,7 @@ void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues
//-------------------------
//handle dynamic font resize:
awt::Size aOldReferenceSize;
- if( xAxisModelProps->getPropertyValue( C2U("ReferenceDiagramSize")) >>= aOldReferenceSize )
+ if( xAxisModelProps->getPropertyValue( C2U("ReferencePageSize")) >>= aOldReferenceSize )
{
uno::Any* pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, C2U("CharHeight") );
lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize );
diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx
index 820a2c9d8d05..41f7c6a8de64 100644
--- a/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/chart2/source/view/main/Linear3DTransformation.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Linear3DTransformation.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -60,11 +60,6 @@ Sequence< double > SAL_CALL Linear3DTransformation::transform(
double fZ = rSourceValues[2];
if(m_bSwapXAndY)
std::swap(fX,fY);
- /*
- ::basegfx::B3DPoint aSource( SequenceToB3DPoint( rSourceValues ) );
- ::basegfx::B3DPoint aTarget = m_Matrix*aSource;
- return B3DPointToSequence(aTarget);
- */
Sequence< double > aNewVec(3);
double fZwi;
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 33c008ebeb31..21bf943c9899 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ShapeFactory.cxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -462,59 +462,6 @@ uno::Any createPolyPolygon_Cone(
return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
}
-uno::Any createPolyPolygon_PieSegment(
- double fHeight
- , double fWidthRadius
- , double fInnerRadius = 0.0)
-{
- DBG_ASSERT(fHeight>0, "The height of a pie segment needs to be > 0");
- DBG_ASSERT(fInnerRadius>=0, "The inner radius of a pie segment needs to be >= 0");
- DBG_ASSERT(fWidthRadius>0, "The width radius of a pie segment needs to be > 0");
-
- const BOOL bClosed = true;
-
- const sal_Int32 nPointCount = bClosed ? 5 : 4;
-
- //--------------------------------------
- drawing::PolyPolygonShape3D aPP;
-
- aPP.SequenceX.realloc(1);
- aPP.SequenceY.realloc(1);
- aPP.SequenceZ.realloc(1);
-
- drawing::DoubleSequence* pOuterSequenceX = aPP.SequenceX.getArray();
- drawing::DoubleSequence* pOuterSequenceY = aPP.SequenceY.getArray();
- drawing::DoubleSequence* pOuterSequenceZ = aPP.SequenceZ.getArray();
-
- pOuterSequenceX->realloc(nPointCount);
- pOuterSequenceY->realloc(nPointCount);
- pOuterSequenceZ->realloc(nPointCount);
-
- double* pInnerSequenceX = pOuterSequenceX->getArray();
- double* pInnerSequenceY = pOuterSequenceY->getArray();
- double* pInnerSequenceZ = pOuterSequenceZ->getArray();
-
- for(sal_Int32 nN = nPointCount; nN--;)
- *pInnerSequenceZ++ = 0.0;
-
- *pInnerSequenceY++ = fHeight/2.0;
- *pInnerSequenceY++ = fHeight/2.0;
- *pInnerSequenceY++ = -fHeight/2.0;
- *pInnerSequenceY++ = -fHeight/2.0;
- if(bClosed)
- *pInnerSequenceY++ = fHeight/2.0;
-
- *pInnerSequenceX++ = fInnerRadius;
- *pInnerSequenceX++ = fInnerRadius+fWidthRadius;
- *pInnerSequenceX++ = fInnerRadius+fWidthRadius;
- *pInnerSequenceX++ = fInnerRadius;
- if(bClosed)
- *pInnerSequenceX++ = fInnerRadius;
-
- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
-}
-
-
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// methods for 3D shape creation
@@ -1537,80 +1484,6 @@ uno::Reference< drawing::XShape >
return xShape;
}
-uno::Reference< drawing::XShape >
- ShapeFactory::createSymbol3D( const uno::Reference< drawing::XShapes >& xTarget
- , const drawing::Position3D& rPosition
- , const drawing::Direction3D& rSize
- , sal_Int32 nStandardSymbol
- , sal_Int32 nBorderColor
- , sal_Int32 nFillColor )
-{
- if( !xTarget.is() )
- return 0;
-
- //create shape
- uno::Reference< drawing::XShape > xShape(
- m_xShapeFactory->createInstance( C2U(
- "com.sun.star.drawing.Shape3DExtrudeObject") ), uno::UNO_QUERY );
- xTarget->add(xShape);
-
- //set properties
- uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
- DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
- if( xProp.is())
- {
- try
- {
- //depth
- xProp->setPropertyValue( C2U( UNO_NAME_3D_EXTRUDE_DEPTH )
- , uno::makeAny((sal_Int32)rSize.DirectionZ) );
-
- //PercentDiagonal
- sal_Int16 nPercentDiagonal = 0;
- xProp->setPropertyValue( C2U( UNO_NAME_3D_PERCENT_DIAGONAL )
- , uno::makeAny( nPercentDiagonal ) );
-
- //Polygon
- xProp->setPropertyValue( C2U( UNO_NAME_3D_POLYPOLYGON3D )
- , uno::makeAny( createPolyPolygon_Symbol( rPosition, rSize, nStandardSymbol ) ) );
-
- //BorderColor
- xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR )
- , uno::makeAny( nBorderColor ) );
-
- //FillColor
- xProp->setPropertyValue( C2U( UNO_NAME_FILLCOLOR )
- , uno::makeAny( nFillColor ) );
- }
- catch( uno::Exception& e )
- {
- ASSERT_EXCEPTION( e );
- }
- }
- return xShape;
-}
-
-void setShapeName( uno::Reference< drawing::XShape >& xShape , const ::rtl::OUString& rName )
-{
- if( !xShape.is() )
- return;
-
- uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
- DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet");
- if( xProp.is())
- {
- try
- {
- xProp->setPropertyValue( C2U( UNO_NAME_MISC_OBJ_NAME )
- , uno::makeAny( rName ) );
- }
- catch( uno::Exception& e )
- {
- ASSERT_EXCEPTION( e );
- }
- }
-}
-
uno::Reference< drawing::XShapes >
ShapeFactory::createGroup2D( const uno::Reference< drawing::XShapes >& xTarget
, ::rtl::OUString aName )
diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx
index 121a76bed285..67b2396682aa 100644
--- a/chart2/source/view/main/Stripe.cxx
+++ b/chart2/source/view/main/Stripe.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: Stripe.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -67,11 +67,6 @@ Stripe::Stripe( const drawing::Position3D& rPoint1
m_aPoint4.PositionZ += fDepth;
}
-drawing::Direction3D Stripe::GetDirectionTo4() const
-{
- return m_aPoint4-m_aPoint1;
-}
-
/*
Stripe::Stripe( const drawing::Position3D& rPoint1
, const drawing::Position3D& rPoint2
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 0dbd37ec6ef5..f15ed34d5209 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VDataSeries.cxx,v $
- * $Revision: 1.33 $
+ * $Revision: 1.32.8.2 $
*
* This file is part of OpenOffice.org.
*
@@ -455,9 +455,9 @@ rtl::OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) cons
aRet = ObjectIdentifier::createDataCurveEquationCID( m_aSeriesParticle, nCurveIndex );
return aRet;
}
-void VDataSeries::setDiagramReferenceSize( const awt::Size & rDiagramRefSize )
+void VDataSeries::setPageReferenceSize( const awt::Size & rPageRefSize )
{
- m_aReferenceSize = rDiagramRefSize;
+ m_aReferenceSize = rPageRefSize;
}
StackingDirection VDataSeries::getStackingDirection() const
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 01fb9c995147..2442a154f8af 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: VLegendSymbolFactory.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -364,149 +364,4 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
return xResult;
}
-// static
-Reference< drawing::XShape >
- VLegendSymbolFactory::createJapaneseCandleStickSymbol(
- const Reference< drawing::XShapes > xSymbolContainer,
- const Reference< lang::XMultiServiceFactory > & xShapeFactory,
- const Reference< beans::XPropertySet > & xLegendEntryProperties,
- bool bWhiteDay )
-{
- Reference< drawing::XShape > xResult;
-
- if( ! (xSymbolContainer.is() &&
- xShapeFactory.is()))
- return xResult;
-
- xResult.set( xShapeFactory->createInstance(
- C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY );
- xSymbolContainer->add( xResult );
- Reference< drawing::XShapes > xResultGroup( xResult, uno::UNO_QUERY );
- if( ! xResultGroup.is())
- return xResult;
-
- // aspect ratio of symbols is always 3:2
- awt::Size aBoundSize( 3000, 2000 );
-
- try
- {
- // create bound
- Reference< drawing::XShape > xBound( ShapeFactory(xShapeFactory).createInvisibleRectangle(
- xResultGroup, aBoundSize ));
-
- Reference< drawing::XShape > xLine(
- xShapeFactory->createInstance(
- C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY );
- if( xLine.is())
- {
- xResultGroup->add( xLine );
- xLine->setSize( awt::Size( 0, 250 ));
- xLine->setPosition( awt::Point( 1500, 0 ));
-
- lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE );
- }
- xLine.set(
- xShapeFactory->createInstance(
- C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY );
- if( xLine.is())
- {
- xResultGroup->add( xLine );
- xLine->setSize( awt::Size( 0, 250 ));
- xLine->setPosition( awt::Point( 1500, 1750 ));
-
- lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE );
- }
-
- Reference< drawing::XShape > xBox(
- xShapeFactory->createInstance(
- C2U( "com.sun.star.drawing.RectangleShape" )), uno::UNO_QUERY );
- if( xBox.is())
- {
- xResultGroup->add( xBox );
- sal_Int32 nSizeX = 1000;
- sal_Int32 nSizeY = 1500;
- xBox->setSize( awt::Size( nSizeX, nSizeY ));
- xBox->setPosition( awt::Point( 1500 - nSizeX/2, 1000 - nSizeY/2 ));
-
- // set CID to symbol for selection
- ShapeFactory::setShapeName(
- xBox, ObjectIdentifier::createClassifiedIdentifierWithParent(
- OBJECTTYPE_LEGEND_ENTRY,
- rtl::OUString(),
- ObjectIdentifier::createChildParticleWithIndex( bWhiteDay ? OBJECTTYPE_DATA_STOCK_GAIN : OBJECTTYPE_DATA_STOCK_LOSS, 0 )
- ));
-
- lcl_setPropetiesToShape( xLegendEntryProperties, xBox, PROP_TYPE_FILL_AND_LINE );
- }
- }
- catch( uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
-
- return xResult;
-}
-
-// static
-Reference< drawing::XShape >
- VLegendSymbolFactory::createStockLineSymbol(
- const Reference< drawing::XShapes > xSymbolContainer,
- const Reference< lang::XMultiServiceFactory > & xShapeFactory,
- const Reference< beans::XPropertySet > & xLegendEntryProperties,
- tStockLineType eType )
-{
- Reference< drawing::XShape > xResult;
-
- if( ! (xSymbolContainer.is() &&
- xShapeFactory.is()))
- return xResult;
-
- xResult.set( xShapeFactory->createInstance(
- C2U( "com.sun.star.drawing.GroupShape" )), uno::UNO_QUERY );
- xSymbolContainer->add( xResult );
- Reference< drawing::XShapes > xResultGroup( xResult, uno::UNO_QUERY );
- if( ! xResultGroup.is())
- return xResult;
-
- // aspect ratio of symbols is always 3:2
- awt::Size aBoundSize( 3000, 2000 );
-
- try
- {
- // create bound
- Reference< drawing::XShape > xBound( ShapeFactory(xShapeFactory).createInvisibleRectangle(
- xResultGroup, aBoundSize ));
-
- Reference< drawing::XShape > xLine(
- xShapeFactory->createInstance(
- C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY );
- if( xLine.is())
- {
- xResultGroup->add( xLine );
- xLine->setSize( awt::Size( 0, 2000 ));
- xLine->setPosition( awt::Point( 1500, 0 ));
-
- lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE_SERIES );
- }
-
- if( eType != STOCK_LINE_TYPE_VERT )
- {
- xLine.set(
- xShapeFactory->createInstance(
- C2U( "com.sun.star.drawing.LineShape" )), uno::UNO_QUERY_THROW );
- xResultGroup->add( xLine );
- xLine->setSize( awt::Size( 500, 0 ));
- xLine->setPosition( awt::Point( ( eType == STOCK_LINE_TYPE_OPEN ) ? 1000 : 1500, 1000 ));
-
- lcl_setPropetiesToShape( xLegendEntryProperties, xLine, PROP_TYPE_LINE_SERIES );
- }
- }
- catch( uno::Exception & ex )
- {
- ASSERT_EXCEPTION( ex );
- }
-
- return xResult;
-}
-
} // namespace chart
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index cf055d6ede21..30a988aa99d0 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sampleaddin.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
*
* This file is part of OpenOffice.org.
*
@@ -46,13 +46,13 @@ using namespace rtl;
extern "C" {
void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+ const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
sal_Bool SAL_CALL component_writeInfo(
- void * pServiceManager, registry::XRegistryKey * pRegistryKey )
+ void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
{
if( pRegistryKey )
{
@@ -81,7 +81,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
void * SAL_CALL component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+ const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void* pRet = 0;
@@ -154,11 +154,11 @@ sal_Bool SampleAddIn::getLogicalPosition( uno::Reference< drawing::XShape >& xAx
if( bVertical )
{
aOutPosition.X = aPos.X;
- aOutPosition.Y = aPos.Y + nLength * (1.0 - fPercentage); // y scale goes from top to bottom
+ aOutPosition.Y = static_cast<sal_Int32>(aPos.Y + nLength * (1.0 - fPercentage)); // y scale goes from top to bottom
}
else
{
- aOutPosition.X = aPos.X + nLength * fPercentage;
+ aOutPosition.X = static_cast<sal_Int32>(aPos.X + nLength * fPercentage);
aOutPosition.Y = aPos.Y;
}
bRet = sal_True;
@@ -389,7 +389,7 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
// put the text centered below the red line
aPos.X += ( aSize.Width - mxMyRedLine->getPosition().X ) / 2;
aPos.Y += 1000;
- aPos.Y += 0.1 * xYAxisShape->getSize().Height;
+ aPos.Y += static_cast<sal_Int32>(0.1 * xYAxisShape->getSize().Height);
mxMyText->setPosition( aPos );
}
}
@@ -421,14 +421,14 @@ void SAL_CALL SampleAddIn::refresh() throw( uno::RuntimeException )
// }
}
-void SAL_CALL SampleAddIn::addRefreshListener( const uno::Reference< util::XRefreshListener >& l )
+void SAL_CALL SampleAddIn::addRefreshListener( const uno::Reference< util::XRefreshListener >& )
throw( uno::RuntimeException )
{
// not implemented - this is not necessary
// (this method exists just because the interface requires it)
}
-void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XRefreshListener >& l )
+void SAL_CALL SampleAddIn::removeRefreshListener( const uno::Reference< util::XRefreshListener >& )
throw( uno::RuntimeException )
{
// not implemented - this is not necessary
diff --git a/chart2/workbench/anyperformance/anyperformance.cxx b/chart2/workbench/anyperformance/anyperformance.cxx
index d82da7126977..e69de29bb2d1 100644
--- a/chart2/workbench/anyperformance/anyperformance.cxx
+++ b/chart2/workbench/anyperformance/anyperformance.cxx
@@ -1,193 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: anyperformance.cxx,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
-
-#include <cstdlib>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <algorithm>
-#include <iostream>
-#include <iterator>
-
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-using namespace ::std;
-using namespace ::com::sun::star;
-
-#define DBG_OUTPUT
-
-typedef double testType;
-// typedef sal_Int32 testType;
-
-struct lcl_Data
-{
- int m_nSeries;
- int m_nPoints;
- enum Type
- {
- TYPE_DOUBLE,
- TYPE_ANY
- } m_eType;
-
- lcl_Data() :
- m_nSeries( 10 ),
- m_nPoints( 10000 ),
- m_eType( TYPE_DOUBLE )
- {}
-
- lcl_Data( int nSeries, int nPoints, Type eType ) :
- m_nSeries( nSeries ),
- m_nPoints( nPoints ),
- m_eType( eType )
- {}
-};
-
-lcl_Data lcl_parseArgs( const vector< string > & aArgs )
-{
- lcl_Data aResult;
-
- if( aArgs.size() > 1 )
- {
- aResult.m_eType = ( aArgs[ 1 ] == string( "any" ))
- ? lcl_Data::TYPE_ANY
- : lcl_Data::TYPE_DOUBLE;
- }
- else
- {
- cerr << "Usage: " << aArgs[ 0 ] << " double|any [series] [points-per-series]" << endl;
- exit( EXIT_FAILURE );
- }
-
- if( aArgs.size() > 2 )
- {
- stringstream aStrStream;
- aStrStream << aArgs[ 2 ];
- aStrStream >> aResult.m_nSeries;
- }
- if( aArgs.size() > 3 )
- {
- stringstream aStrStream;
- aStrStream << aArgs[ 3 ];
- aStrStream >> aResult.m_nPoints;
- }
-
- return aResult;
-}
-
-template< typename T >
- struct lcl_MakeAny : public unary_function< uno::Any, T >
- {
- uno::Any operator() ( const T & rVal )
- {
- return uno::makeAny( rVal );
- }
- };
-
-// ========================================
-// MAIN
-// ========================================
-
-int SAL_CALL main( int argc, char* argv[] )
-{
- // parse arguments
- // arg0: number of series
- // arg1: number of points per series
- vector< string > aArgs( argc );
- copy( argv, argv + argc, aArgs.begin() );
-
- lcl_Data aParams( lcl_parseArgs( aArgs ));
-
- // create data
- vector< testType > aSeries( aParams.m_nPoints, 23 );
- vector< vector< testType > > aData( aParams.m_nSeries, aSeries );
-
- switch( aParams.m_eType )
- {
- case lcl_Data::TYPE_DOUBLE:
-#ifdef DBG_OUTPUT
- cout << "Testing native type: " << endl;
-#endif
- {
- uno::Sequence< uno::Sequence< testType > > aSeq;
- aSeq.realloc( aParams.m_nSeries );
- uno::Sequence< testType > * pArr = aSeq.getArray();
-
- for( vector< vector< testType > >::const_iterator aIter = aData.begin();
- aIter != aData.end();
- ++aIter, ++pArr )
- {
- pArr->realloc( aParams.m_nPoints );
- copy( (*aIter).begin(), (*aIter).end(),
- pArr->getArray() );
- }
- }
- break;
- case lcl_Data::TYPE_ANY:
-#ifdef DBG_OUTPUT
- cout << "Testing Anies" << endl;
-#endif
- {
- uno::Sequence< uno::Sequence< uno::Any > > aSeq;
- aSeq.realloc( aParams.m_nSeries );
- uno::Sequence< uno::Any > * pArr = aSeq.getArray();
-
- for( vector< vector< testType > >::const_iterator aIter = aData.begin();
- aIter != aData.end();
- ++aIter, ++pArr )
- {
- pArr->realloc( aParams.m_nPoints );
- transform( (*aIter).begin(), (*aIter).end(),
- pArr->getArray(), lcl_MakeAny< testType >() );
- }
- }
- break;
- }
-
-
-#if 0
- // output data
- for( vector< vector< testType > >::const_iterator aIter = aData.begin();
- aIter != aData.end();
- ++aIter)
- {
- cout << "Series: * ";
- copy( (*aIter).begin(), (*aIter).end(),
- ostream_iterator< testType >( cout, " * " ));
- cout << endl;
- }
-#endif
-
- return EXIT_SUCCESS;
-}
diff --git a/chart2/workbench/anyperformance/makefile.mk b/chart2/workbench/anyperformance/makefile.mk
index 222ad762a328..e69de29bb2d1 100644
--- a/chart2/workbench/anyperformance/makefile.mk
+++ b/chart2/workbench/anyperformance/makefile.mk
@@ -1,140 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=anyperformance
-TARGET= anyperformance
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCROUT=$(OUT)$/inc$/test
-INCPRE+=$(OUT)$/inc$/test
-
-OBJFILES= \
- $(OBJ)$/anyperformance.obj
-
-APP1TARGET= anyperformance
-APP1OBJS= \
- $(OBJ)$/anyperformance.obj
-
-APP1STDLIBS+= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALHELPERLIB) \
- $(SALLIB)
-
-APP1DEF=$(MISC)$/$(APP1TARGET).def
-
-#ALLIDLFILES:= \
-# cpputest.idl \
-# language_binding.idl \
-# alignment.idl
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-#ALL : $(BIN)$/anyperformance.rdb unoheader ALLTAR
-ALL : ALLTAR
-.ELSE
-ALL: ALLDEP
-.ENDIF
-
-.IF "$(COM)" == "MSC"
-.IF "$(debug)" != ""
-CFLAGS += /Ob0
-.ENDIF
-.ENDIF
-
-.IF "$(extra_mapping)" != ""
-CFLAGS += -DEXTRA_MAPPING
-.ENDIF
-
-.INCLUDE : target.mk
-
-CPPUMAKERFLAGS = -C
-.IF "$(COM)" == "MSC"
-CPPUMAKERFLAGS = -L
-.ENDIF
-
-#TYPES:= -Ttest.XLanguageBindingTest \
-# -Ttest.XSimpleInterface \
-# -Ttest.Test1 \
-# -Ttest.Test2 \
-# -Ttest.TdTest1 \
-# -Ttest.Test3 \
-# -Ttest.Base \
-# -Ttest.Base1 \
-# -Ttest.Base2 \
-# -Tcom.sun.star.lang.XMultiServiceFactory \
-# -Tcom.sun.star.lang.XSingleServiceFactory \
-# -Tcom.sun.star.lang.XInitialization \
-# -Tcom.sun.star.lang.XServiceInfo \
-# -Tcom.sun.star.lang.XEventListener \
-# -Tcom.sun.star.lang.XTypeProvider \
-# -Tcom.sun.star.registry.XSimpleRegistry \
-# -Tcom.sun.star.registry.XRegistryKey \
-# -Tcom.sun.star.loader.XImplementationLoader \
-# -Tcom.sun.star.registry.XImplementationRegistration \
-# -Tcom.sun.star.lang.XComponent \
-# -Tcom.sun.star.uno.XComponentContext \
-# -Tcom.sun.star.container.XSet \
-# -Tcom.sun.star.container.XNameContainer \
-# -Tcom.sun.star.uno.TypeClass \
-# -Tcom.sun.star.uno.XReference \
-# -Tcom.sun.star.uno.XAdapter \
-# -Tcom.sun.star.uno.XAggregation \
-# -Tcom.sun.star.uno.XWeak \
-# -Tcom.sun.star.beans.XPropertySet \
-# -Tcom.sun.star.reflection.XIdlClassProvider \
-# -Tcom.sun.star.container.XHierarchicalNameAccess \
-# -Tcom.sun.star.uno.XCurrentContext
-
-$(BIN)$/anyperformance.rdb: $(ALLIDLFILES)
- idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $?
- regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
- regmerge $@ / $(UNOUCRRDB)
- touch $@
-
-# regcomp -register -r $@ -c javaloader.dll
-# regcomp -register -r $@ -c jen.dll
-
-unoheader: $(BIN)$/anyperformance.rdb
- cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/anyperformance.rdb
-# cunomaker -BUCR -O$(UNOUCROUT) $(TYPES) $(BIN)$/anyperformance.rdb
-
diff --git a/chart2/workbench/fileformat/chart.mod b/chart2/workbench/fileformat/chart.mod
index a53b34843c16..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/chart.mod
+++ b/chart2/workbench/fileformat/chart.mod
@@ -1,237 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: chart.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-
-<!ENTITY % chart-class "(line|area|circle|ring|scatter|radar|bar|stock|add-in)">
-<!-- xxxx ::: maybe expand this for K-Office: +gantt and +surface ? for excel -->
-<!ENTITY % chart-solid-type "(cuboid|cylinder|cone|pyramid)">
-
-<!-- Chart element -->
-<!ELEMENT chart:chart ( chart:title?, chart:subtitle?, chart:legend?,
- chart:plot-area,
- table:table? )>
-<!ATTLIST chart:chart
- chart:class %chart-class; #REQUIRED
- chart:add-in-name %string; #IMPLIED
- chart:table-number-list %string; #IMPLIED
- draw:name %string; #IMPLIED
- %draw-position;
- %draw-size;
- %draw-style-name;
- chart:column-mapping %string; #IMPLIED
- chart:row-mapping %string; #IMPLIED
- chart:style-name %styleName; #IMPLIED>
-
-<!ATTLIST chart:chart %presentation-class; >
-<!ATTLIST chart:chart %zindex;>
-<!ATTLIST chart:chart %draw-end-position; >
-<!ATTLIST chart:chart draw:id %draw-shape-id; >
-<!ATTLIST chart:chart draw:layer %layerName; #IMPLIED>
-
-<!ATTLIST style:properties
- chart:scale-text %boolean; "true"
- chart:stock-updown-bars %boolean; "false"
- chart:stock-with-volume %boolean; "false"
- chart:three-dimensional %boolean; "false"
- chart:deep %boolean; "false"
- chart:lines %boolean; "false"
- chart:percentage %boolean; "false"
- chart:solid-type %chart-solid-type; "cuboid"
- chart:splines %nonNegativeInteger; "0"
- chart:stacked %boolean; "false"
- chart:symbol %integer; "-1"
- chart:vertical %boolean; "false"
- chart:lines-used %nonNegativeInteger; "0"
- chart:connect-bars %boolean; "false"
- chart:spline-order %nonNegativeInteger; "2"
- chart:spline-resolution %nonNegativeInteger; "20"
- chart:pie-offset %nonNegativeInteger; "0">
-
-<!-- Main/Sub Title -->
-<!-- the cell-address attribute is currently not supported for titles -->
-<!ELEMENT chart:title (text:p)?>
-<!ATTLIST chart:title
- table:cell-range %cell-address; #IMPLIED
- svg:x %coordinate; #IMPLIED
- svg:y %coordinate; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-
-<!ELEMENT chart:subtitle (text:p)?>
-<!ATTLIST chart:subtitle
- table:cell-range %cell-address; #IMPLIED
- svg:x %coordinate; #IMPLIED
- svg:y %coordinate; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-
-<!-- you must specify either a legend-position or both, x and y coordinates -->
-<!ELEMENT chart:legend EMPTY>
-<!ATTLIST chart:legend
- chart:legend-position (top|left|bottom|right) "right"
-<!-- xxxx ::: add this for K-Office -->
- chart:legend-alignment (center|left-or-top|right-or-bottom)
- svg:x %coordinate; #IMPLIED
- svg:y %coordinate; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-<!-- Plot-Area specification -->
-<!ELEMENT chart:plot-area (dr3d:light*,
- chart:axis*,
-<!-- xxxx ::: for K-Office move categories to axis-->
- chart:categories?,
- chart:series*,
- chart:stock-gain-marker?,
- chart:stock-loss-marker?,
- chart:stock-range-line?,
- chart:wall?,
- chart:floor?) >
-<!ATTLIST chart:plot-area
- svg:x %coordinate; #IMPLIED
- svg:y %coordinate; #IMPLIED
- svg:width %length; #IMPLIED
- svg:height %length; #IMPLIED
- chart:style-name %styleName; #IMPLIED
- table:cell-range-address %cell-range-address; #IMPLIED
- chart:table-number-list %string; #IMPLIED
- chart:data-source-has-labels (none|row|column|both) "none" >
-<!-- 3d scene attributes on plot-area -->
-<!ATTLIST chart:plot-area
- dr3d:vrp %vector3D; #IMPLIED
- dr3d:vpn %vector3D; #IMPLIED
- dr3d:vup %vector3D; #IMPLIED
- dr3d:projection (parallel|perspective) #IMPLIED
- dr3d:transform CDATA #IMPLIED
- dr3d:distance %length; #IMPLIED
- dr3d:focal-length %length; #IMPLIED
- dr3d:shadow-slant %nonNegativeInteger; #IMPLIED
- dr3d:shade-mode (flat|phong|gouraud|draft) #IMPLIED
- dr3d:ambient-color %color; #IMPLIED
- dr3d:lighting-mode %boolean; #IMPLIED >
-<!ATTLIST style:properties
- chart:series-source (columns|rows) "columns" >
-<!ELEMENT chart:wall EMPTY>
-<!ATTLIST chart:wall
- svg:width %length; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:floor EMPTY>
-<!ATTLIST chart:floor
- svg:width %length; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-<!-- Stock chart elements -->
-<!ELEMENT chart:stock-gain-marker EMPTY>
-<!ATTLIST chart:stock-gain-marker
- chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:stock-loss-marker EMPTY>
-<!ATTLIST chart:stock-loss-marker
- chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:stock-range-line EMPTY>
-<!ATTLIST chart:stock-range-line
- chart:style-name %styleName; #IMPLIED >
-<!-- Axis -->
-<!ELEMENT chart:axis (chart:title?, chart:grid*)>
-<!ATTLIST chart:axis
- chart:class (category|value|series|domain) #REQUIRED
- chart:name %string; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-<!ATTLIST style:properties
- chart:tick-marks-major-inner %boolean; "false"
- chart:tick-marks-major-outer %boolean; "true"
- chart:tick-marks-minor-inner %boolean; "false"
- chart:tick-marks-minor-outer %boolean; "false"
- chart:logarithmic %boolean; "false"
- chart:maximum %float; #IMPLIED
- chart:minimum %float; #IMPLIED
- chart:origin %float; #IMPLIED
- chart:interval-major %float; #IMPLIED
- chart:interval-minor %float; #IMPLIED
- chart:gap-width %integer; #IMPLIED
- chart:overlap %integer; #IMPLIED
- text:line-break %boolean; "true"
- chart:display-label %boolean; "true"
- chart:label-arrangement (side-by-side|stagger-even|stagger-odd) "side-by-side"
- chart:text-overlap %boolean; "false"
- chart:visible %boolean; "true"
- chart:link-data-style-to-source %boolean; "true" >
-<!ELEMENT chart:grid EMPTY>
-<!ATTLIST chart:grid
- chart:class (major|minor) "major"
- chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:categories EMPTY>
-<!ATTLIST chart:categories
- table:cell-range-address %cell-range-address; #IMPLIED >
-<!--
- each series element must have an cell-range-address element that points
- to the underlying table data.
- Impl. Note: Internally all href elements are merged to one table range
- that represents the data for the whole chart
--->
-<!ELEMENT chart:series ( chart:domain*,
- chart:data-point* )>
-<!ATTLIST chart:series
- chart:values-cell-range-address %cell-range-address; #IMPLIED
- chart:label-cell-address %cell-address; #IMPLIED
- chart:class %chart-class; #IMPLIED
- chart:attached-axis %string; #IMPLIED
-<!-- xxxx ::: replace? this for K-Office -->
- chart:attached-axis-x %string; #IMPLIED
- chart:attached-axis-y %string; #IMPLIED
- chart:attached-axis-z %string; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-<!ELEMENT chart:domain EMPTY>
-<!ATTLIST chart:domain
- table:cell-range-address %cell-range-address; #IMPLIED >
-<!ELEMENT chart:data-point EMPTY>
-<!ATTLIST chart:data-point
- chart:repeated %nonNegativeInteger; #IMPLIED
- chart:style-name %styleName; #IMPLIED >
-<!-- statistical properties -->
-<!ATTLIST style:properties
- chart:mean-value %boolean; #IMPLIED
- chart:error-category (none|variance|standard-deviation|percentage|error-margin|constant) "none"
- chart:error-percentage %float; #IMPLIED
- chart:error-margin %float; #IMPLIED
- chart:error-lower-limit %float; #IMPLIED
- chart:error-upper-limit %float; #IMPLIED
- chart:error-upper-indicator %boolean; #IMPLIED
- chart:error-lower-indicator %boolean; #IMPLIED
- chart:regression-type (none|linear|logarithmic|exponential|power) "none" >
-<!-- data label properties -->
-<!ATTLIST style:properties
- chart:data-label-number (none|value|percentage) "none"
- chart:data-label-text %boolean; "false"
- chart:data-label-symbol %boolean; "false" >
-<!-- general text properties -->
-<!ATTLIST style:properties
- text:rotation-angle %integer; "0"
- fo:direction (ltr|ttb) #IMPLIED >
-<!-- symbol properties -->
-<!ATTLIST style:properties
- chart:symbol-width %nonNegativeLength; #IMPLIED
- chart:symbol-height %nonNegativeLength; #IMPLIED
- chart:symbol-image-name %string; #IMPLIED >
diff --git a/chart2/workbench/fileformat/chart2.mod b/chart2/workbench/fileformat/chart2.mod
index 20bd17fbc318..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/chart2.mod
+++ b/chart2/workbench/fileformat/chart2.mod
@@ -1,187 +0,0 @@
-<!-- ************************************************************************************************************************ -->
-<!-- a name of a registered UNO service-->
-<!ENTITY % service-name "CDATA">
-<!-- chart2 *************************************************************************************************************** -->
-<!ELEMENT chart2:chart2 (chart2:legend*, chart2:scale*, chart2:increment*, chart2:final-target+, chart2:resident*, table:table?)>
-<!-- title ******************************************************************************************************************* -->
-<!ELEMENT chart2:title EMPTY>
-<!-- create your own name here to identifiy this title object for use in a ... ?-->
-<!ATTLIST chart2:title
- id ID #REQUIRED
->
-<!-- legend *************************************************************************************************************** -->
-<!ELEMENT chart2:legend EMPTY>
-<!-- create your own name here to identifiy this legend object for use in a plot-container or coordinate-system-->
-<!ATTLIST chart2:legend
- id ID #REQUIRED
->
-<!-- contains a name of a registered uno component implementing the service ...'legend' ... -->
-<!ATTLIST chart2:legend
- service %service-name; #REQUIRED
->
-<!-- final-target *********************************************************************************************************** -->
-<!ELEMENT chart2:final-target (chart2:title?, chart2:logic-target)>
-<!-- create your own name here to identifiy this final-target object -->
-<!ATTLIST chart2:final-target
- id ID #REQUIRED
->
-<!-- choose the id of a legend that should be used as default legend for all data series contained in this final target;
- the legend has to be described somewhere else in this document -->
-<!ATTLIST chart2:final-target
- legend IDREF #IMPLIED
->
-<!-- logic-target ********************************************************************************************************** -->
-<!ELEMENT chart2:logic-target (chart2:coordinate-system+, chart2:logic-target*)>
-<!-- create your own name here to identifiy this logic-target object -->
-<!ATTLIST chart2:logic-target
- id ID #REQUIRED
->
-<!-- choose the id of a legend that should be used as default legend for all data series contained in this logic target;
- the legend has to be described somewhere else in this document -->
-<!ATTLIST chart2:logic-target
- legend IDREF #IMPLIED
->
-<!-- coordinatesystem ************************************************************************************************** -->
-<!ELEMENT chart2:coordinate-system (chart2:scaleRef*)>
-<!-- create your own name here to identifiy this coordinatesystem object for use in a renderer-->
-<!ATTLIST chart2:coordinate-system
- id ID #REQUIRED
->
-<!-- contains a name of a registered uno component implementing the service ...'coordinate-system' ... -->
-<!ATTLIST chart2:coordinate-system
- service %service-name; #REQUIRED
->
-<!-- choose the id of a legend that should be used for this coordinate system;
- the legend has to be described somewhere else in this document -->
-<!ATTLIST chart2:coordinate-system
- legend IDREF #IMPLIED
->
-<!-- scale ***************************************************************************************************************** -->
-<!ELEMENT chart2:scale (chart2:break*)>
-<!-- create your own name here to identifiy this scale object for use in a coordinate system-->
-<!ATTLIST chart2:scale
- id ID #REQUIRED
->
-<!-- if the maximum value of the scale should be calculated automatically do not set this attribute-->
-<!ATTLIST chart2:scale
- maximum %float; #IMPLIED
->
-<!-- if the minimum value of the scale should be calculated automatically do not set this attribute-->
-<!ATTLIST chart2:scale
- minimum %float; #IMPLIED
->
-<!-- choose a name of a registered uno component implementing the service ...scaling' ... e.g. com.sun.star.LogarithmicScaling;
- if no scaling-service is set a linear scaling will be used-->
-<!ATTLIST chart2:scale
- scaling-service %service-name; #IMPLIED
->
-<!-- scaleRef ************************************************************************************************************* -->
-<!ELEMENT chart2:scaleRef EMPTY>
-<!-- choose the id of a scale that should be used here -->
-<!ATTLIST chart2:scaleRef
- scale IDREF #REQUIRED
->
-<!-- choose the direction in which the scale should be applied;
- if no direction is set the mathematical direction is used -->
-<!-- !!!!!!!!!! .... maybe remove languagedependent here -->
-<!ATTLIST chart2:scaleRef
- direction (mathematical | reverse | languagedependent) #IMPLIED
->
-<!-- break ***************************************************************************************************************** -->
-<!ELEMENT chart2:break EMPTY>
-<!-- the value where the break starts and ends on the scale -->
-<!ATTLIST chart2:break
- start %float; #REQUIRED
- end %float; #REQUIRED
->
-<!-- increment ************************************************************************************************************ -->
-<!ELEMENT chart2:increment (chart2:subincrement*)>
-<!-- create your own name here to identifiy this increment object for use in an axis and/or grid -->
-<!ATTLIST chart2:increment
- id ID #REQUIRED
->
-<!-- choose the id of a scale that should be used for autocalculation of the values of this increment;
- the scale has to be described somewhere else in this document -->
-<!ATTLIST chart2:increment
- scale IDREF #REQUIRED
->
-<!-- an offset (measured in values before scaling) to which ticks are relatively positioned;
- if this attribute is not set 0 is assumed;
- if the given value is not valid in the associated scaling(s) the minimum of the scaling(s) is assumed )-->
-<!ATTLIST chart2:increment
- pre-offset %float; #IMPLIED
->
-<!-- a distance (measured in values before scaling) how far ticks are seperated one from each other;
- this value is ignored as long as the attribute post-equidistant is true;
- if attribute post-equidistant is false and this value is missing it will be automatically calculated -->
-<!ATTLIST chart2:increment
- pre-distance %float; #IMPLIED
->
-<!-- a distance (measured in values after scaling) how far ticks are seperated one from each other
- this value is ignored as long as the attribute post-equidistant is false;
- if attribute post-equidistant is true and this value is missing it will be automatically calculated -->
-<!ATTLIST chart2:increment
- post-distance %float; #IMPLIED
->
-<!-- if the post-equidistant attribute is missing or set to false tickmarks will be positioned equidistant measured in values before scaling otherwise equidistant after scaling;
- for example lets assume to have a logarithmic scaling - then with post-equidistant=true and post-distance=1 you will get tichmarks at 0, 1, 10, 100 etc.
- having post-equidistant=false and pre-distance=1 you will have tickmarks at 0,1,2,3,4 etc.-->
-<!ATTLIST chart2:increment
- post-equidistant %boolean; #IMPLIED
->
-<!-- subincrement ************************************************************************************************************ -->
-<!ELEMENT chart2:subincrement EMPTY>
-<!-- any parent range will be divided into this count of sub-ranges; values lower than 2 have no effect;
- if no value is set the count will be calculated automatically -->
-<!ATTLIST chart2:subincrement
- count %integer; #IMPLIED
->
-<!-- if the post-equidistant attribute is missing or set to false the sub-ranges will be equal to each other measured in values before scaling otherwise measured after scaling -->
-<!ATTLIST chart2:subincrement
- post-equidistant %boolean; #IMPLIED
->
-<!-- resident ************************************************************************************************************** -->
-<!ELEMENT chart2:resident ANY>
-<!-- contained child elements could be for example (chart2:axis|chart2:grid|chart2:renderer) -->
-<!-- create your own name to identifiy this resident object -->
-<!ATTLIST chart2:resident
- id ID #REQUIRED
->
-<!-- contains a name of a registered UNO component supporting the service ... or interface?...'resident' ...;
-if a child element is contained there are additional requirements to the UNO component:
-axis: the service ... 'axis' needs to be supported
-grid: the service ... 'grid' needs to be supported
-renderer: the service ... 'datarenderer' needs to be supported
--->
-<!ATTLIST chart2:resident
- service %service-name; #REQUIRED
->
-<!-- choose the id of a coordinatesystem that should be used;
- that coordinatesystem has to be described somewhere else in this document -->
-<!ATTLIST chart2:resident
- coordinate-system IDREF #REQUIRED
->
-<!-- axis ******************************************************************************************************************* -->
-<!ELEMENT chart2:axis EMPTY>
-<!-- state which dimension of the coordinate system the axis should use (e.g. for cartesian coordinates x is dimension 1 and y is dimansion 2)-->
-<!ATTLIST chart2:axis
- dimension %integer; #REQUIRED
->
-<!-- choose the id of an increment that should be used;
- that increment has to be described somewhere else in this document -->
-<!ATTLIST chart2:axis
- increment IDREF #REQUIRED
->
-<!-- grid ******************************************************************************************************************* -->
-<!ELEMENT chart2:grid EMPTY>
-<!-- state which dimension of the coordinate system the axis should use (e.g. for cartesian coordinates x is dimension 1 and y is dimansion 2)-->
-<!ATTLIST chart2:grid
- dimension %integer; #REQUIRED
->
-<!-- choose the id of an increment that should be used;
- that increment has to be described somewhere else in this document -->
-<!ATTLIST chart2:grid
- increment IDREF #REQUIRED
->
-<!-- renderer ************************************************************************************************************* -->
-<!ELEMENT chart2:renderer EMPTY>
diff --git a/chart2/workbench/fileformat/content.xml b/chart2/workbench/fileformat/content.xml
index b476d182b9bf..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/content.xml
+++ b/chart2/workbench/fileformat/content.xml
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE office:document-content PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd"><office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" office:class="chart" office:version="1.0">
-
-<office:automatic-styles>
- <number:number-style style:name="N0" style:family="data-style">
- <number:number number:min-integer-digits="1"/>
- </number:number-style>
- <style:style style:name="ch1" style:family="chart">
- <style:properties draw:stroke="none" draw:fill-color="#ffffff"/>
- </style:style>
- <style:style style:name="ch2" style:family="chart">
- <style:properties fo:direction="ltr" draw:stroke="none" draw:fill="none" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="23.2000007629395pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="23.2000007629395pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="23.2000007629395pt"/>
- </style:style>
- <style:style style:name="ch3" style:family="chart">
- <style:properties draw:fill="none" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="10.6999998092651pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="10.6999998092651pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="10.6999998092651pt"/>
- </style:style>
- <style:style style:name="ch4" style:family="chart">
- <style:properties chart:stock-updown-bars="false" chart:stock-with-volume="false" chart:three-dimensional="false" chart:deep="false" chart:lines="false" chart:splines="0" chart:symbol="-3" chart:vertical="false" chart:lines-used="0" chart:connect-bars="false" chart:series-source="columns" chart:mean-value="false" chart:error-margin="0" chart:error-lower-limit="0" chart:error-upper-limit="0" chart:error-category="none" chart:error-percentage="0" chart:regression-type="none" chart:data-label-number="none" chart:data-label-text="false" chart:data-label-symbol="false"/>
- </style:style>
- <style:style style:name="ch5" style:family="chart" style:data-style-name="N0">
- <style:properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:text-overlap="false" text:line-break="true" chart:label-arrangement="side-by-side" chart:visible="true" fo:direction="ltr" draw:stroke="solid" svg:stroke-width="0.051cm" svg:stroke-color="#000000" draw:marker-start-width="0.279cm" draw:marker-end-width="0.279cm" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="10.8999996185303pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="10.8999996185303pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="10.8999996185303pt"/>
- </style:style>
- <style:style style:name="ch6" style:family="chart" style:data-style-name="N0">
- <style:properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:origin="0" chart:gap-width="100" chart:overlap="0" chart:text-overlap="false" text:line-break="false" chart:label-arrangement="side-by-side" chart:visible="true" fo:direction="ltr"
- draw:stroke="solid" svg:stroke-width="0cm" svg:stroke-color="#000000" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="12.5pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="12.5pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="12.5pt"/>
- </style:style>
- <style:style style:name="ch7" style:family="chart" style:data-style-name="N0">
- <style:properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:text-overlap="false" text:line-break="false" chart:label-arrangement="side-by-side" chart:visible="true" fo:direction="ltr" draw:stroke="solid" svg:stroke-width="0cm" svg:stroke-color="#000000" fo:color="#000000" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="12.5pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="12.5pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="12.5pt"/>
- </style:style>
- <style:style style:name="ch8" style:family="chart">
- <style:properties draw:fill-color="#9999ff" fo:font-family="Albany" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="10.6999998092651pt" style:font-family-asian="&apos;Andale Sans UI&apos;" style:font-pitch-asian="variable" style:font-size-asian="10.6999998092651pt" style:font-family-complex="&apos;Arial Unicode MS&apos;" style:font-pitch-complex="variable" style:font-size-complex="10.6999998092651pt"/>
- </style:style>
- <style:style style:name="ch9" style:family="chart">
- <style:properties draw:stroke="none" draw:fill="none"/>
- </style:style>
- <style:style style:name="ch10" style:family="chart">
- <style:properties draw:stroke="none" draw:fill-color="#999999"/>
- </style:style>
-</office:automatic-styles>
-
-<office:body>
- <chart:chart svg:width="20.088cm" svg:height="12.514cm" chart:class="bar" chart:style-name="ch1">
- <chart:title svg:x="8.318cm" svg:y="0.25cm" chart:style-name="ch2">
- <text:p>Haupttitel</text:p>
- </chart:title>
- <chart:legend chart:legend-position="right" svg:x="17.516cm" svg:y="5.92cm" chart:style-name="ch3"/>
- <chart:plot-area chart:style-name="ch4" table:cell-range-address="Tabelle1.$A$6:.$A$7" chart:table-number-list="0" svg:x="0.4cm" svg:y="1.656cm" svg:width="16.317cm" svg:height="10.608cm">
- <chart:axis chart:class="category" chart:name="primary-x" chart:style-name="ch5"/>
- <chart:axis chart:class="value" chart:name="primary-y" chart:style-name="ch6"/>
- <chart:axis chart:class="series" chart:name="primary-z" chart:style-name="ch7"/>
- <chart:series chart:style-name="ch8">
- <chart:data-point chart:repeated="2"/>
- </chart:series>
- <chart:wall chart:style-name="ch9"/>
- <chart:floor chart:style-name="ch10"/>
- </chart:plot-area>
- <table:table table:name="local-table">
- <table:table-header-columns>
- <table:table-column/>
- </table:table-header-columns>
- <table:table-columns>
- <table:table-column table:number-columns-repeated="1"/>
- </table:table-columns>
- <table:table-header-rows>
- <table:table-row>
- <table:table-cell/>
- <table:table-cell table:value-type="string">
- <text:p>Spalte A</text:p>
- </table:table-cell>
- </table:table-row>
- </table:table-header-rows>
- <table:table-rows>
- <table:table-row>
- <table:table-cell table:value-type="string">
- <text:p>Zeile 6</text:p>
- </table:table-cell>
- <table:table-cell table:value-type="float" table:value="-2">
- <text:p>-2
- </text:p>
- </table:table-cell>
- </table:table-row>
- <table:table-row>
- <table:table-cell table:value-type="string">
- <text:p>Zeile 7
- </text:p>
- </table:table-cell>
- <table:table-cell table:value-type="float" table:value="2">
- <text:p>2
- </text:p>
- </table:table-cell>
- </table:table-row>
- </table:table-rows>
- </table:table>
-</chart:chart>
-</office:body>
-
-</office:document-content> \ No newline at end of file
diff --git a/chart2/workbench/fileformat/datastyl.mod b/chart2/workbench/fileformat/datastyl.mod
index 46eb6ad36c8a..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/datastyl.mod
+++ b/chart2/workbench/fileformat/datastyl.mod
@@ -1,175 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: datastyl.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!-- data styles -->
-<!ENTITY % any-number "( number:number | number:scientific-number | number:fraction )">
-<!ENTITY % number-style-content "( (number:text,(%any-number;,number:text?)?) | (%any-number;,number:text?) )">
-<!ELEMENT number:number-style ( style:properties?, %number-style-content;, style:map* )>
-<!ELEMENT number:number ( number:embedded-text* )>
-<!ELEMENT number:scientific-number EMPTY>
-<!ELEMENT number:fraction EMPTY>
-
-<!ELEMENT number:embedded-text (#PCDATA)>
-<!ATTLIST number:embedded-text number:position %integer; #REQUIRED>
-
-<!ENTITY % currency-symbol-and-text "number:currency-symbol,number:text?">
-<!ENTITY % number-and-text "number:number,number:text?">
-<!ENTITY % currency-symbol-and-number "((%number-and-text;),(%currency-symbol-and-text;)?) | ((%currency-symbol-and-text;),(%number-and-text;)?)">
-<!ENTITY % currency-style-content "number:text?, (%currency-symbol-and-number;)?">
-
-<!ELEMENT number:currency-style ( style:properties?, (%currency-style-content;), style:map* )>
-<!ELEMENT number:currency-symbol (#PCDATA)>
-<!ATTLIST number:currency-symbol number:language CDATA #IMPLIED>
-<!ATTLIST number:currency-symbol number:country CDATA #IMPLIED>
-
-<!ENTITY % percentage-style-content "( (number:text,(%number-and-text;)?) | (%number-and-text;) )">
-<!ELEMENT number:percentage-style ( style:properties?, %percentage-style-content;, style:map* )>
-
-<!ENTITY % any-date "( number:day | number:month | number:year | number:era | number:day-of-week | number:week-of-year | number:quarter| number:hours | number:am-pm | number:minutes | number:seconds )">
-<!ENTITY % date-style-content "( (number:text,(%any-date;,number:text?)+) | (%any-date;,number:text?)+ )">
-<!ELEMENT number:date-style ( style:properties?, %date-style-content;, style:map* )>
-<!ELEMENT number:day EMPTY>
-<!ATTLIST number:day number:style (short|long) "short">
-<!ATTLIST number:day number:calendar CDATA #IMPLIED>
-<!ELEMENT number:month EMPTY>
-<!ATTLIST number:month number:textual %boolean; "false">
-<!ATTLIST number:month number:style (short|long) "short">
-<!ATTLIST number:month number:calendar CDATA #IMPLIED>
-<!ELEMENT number:year EMPTY>
-<!ATTLIST number:year number:style (short|long) "short">
-<!ATTLIST number:year number:calendar CDATA #IMPLIED>
-<!ELEMENT number:era EMPTY>
-<!ATTLIST number:era number:style (short|long) "short">
-<!ATTLIST number:era number:calendar CDATA #IMPLIED>
-<!ELEMENT number:day-of-week EMPTY>
-<!ATTLIST number:day-of-week number:style (short|long) "short">
-<!ATTLIST number:day-of-week number:calendar CDATA #IMPLIED>
-<!ELEMENT number:week-of-year EMPTY>
-<!ATTLIST number:week-of-year number:calendar CDATA #IMPLIED>
-<!ELEMENT number:quarter EMPTY>
-<!ATTLIST number:quarter number:style (short|long) "short">
-<!ATTLIST number:quarter number:calendar CDATA #IMPLIED>
-
-<!ENTITY % any-time "( number:hours | number:am-pm | number:minutes | number:seconds )">
-<!ENTITY % time-style-content "( (number:text,(%any-time;,number:text?)+) | (%any-time;,number:text?)+)">
-<!ELEMENT number:time-style ( style:properties?, %time-style-content;, style:map* )>
-<!ELEMENT number:hours EMPTY>
-<!ATTLIST number:hours number:style (short|long) "short">
-<!ELEMENT number:minutes EMPTY>
-<!ATTLIST number:minutes number:style (short|long) "short">
-<!ELEMENT number:seconds EMPTY>
-<!ATTLIST number:seconds number:style (short|long) "short">
-<!ATTLIST number:seconds number:decimal-places %integer; "0">
-<!ELEMENT number:am-pm EMPTY>
-
-<!ENTITY % boolean-style-content "( (number:text,(number:boolean,number:text?)?) | (number:boolean,number:text?) )">
-<!ELEMENT number:boolean-style ( style:properties?,%boolean-style-content;, style:map* )>
-<!ELEMENT number:boolean EMPTY>
-
-<!ENTITY % text-style-content "( (number:text,(number:text-content,number:text?)?) | (number:text-content,number:text?) )">
-<!ELEMENT number:text-style ( style:properties?,%text-style-content;, style:map* )>
-<!ELEMENT number:text (#PCDATA)>
-<!ELEMENT number:text-content EMPTY>
-
-<!ATTLIST number:number-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:currency-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:percentage-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:date-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:time-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:boolean-style style:name %styleName; #REQUIRED>
-<!ATTLIST number:text-style style:name %styleName; #REQUIRED>
-
-<!ATTLIST number:number-style style:family CDATA #REQUIRED>
-<!ATTLIST number:currency-style style:family CDATA #REQUIRED>
-<!ATTLIST number:percentage-style style:family CDATA #REQUIRED>
-<!ATTLIST number:date-style style:family CDATA #REQUIRED>
-<!ATTLIST number:time-style style:family CDATA #REQUIRED>
-<!ATTLIST number:boolean-style style:family CDATA #REQUIRED>
-<!ATTLIST number:text-style style:family CDATA #REQUIRED>
-
-<!ATTLIST number:number-style number:language CDATA #IMPLIED>
-<!ATTLIST number:currency-style number:language CDATA #IMPLIED>
-<!ATTLIST number:percentage-style number:language CDATA #IMPLIED>
-<!ATTLIST number:date-style number:language CDATA #IMPLIED>
-<!ATTLIST number:time-style number:language CDATA #IMPLIED>
-<!ATTLIST number:boolean-style number:language CDATA #IMPLIED>
-<!ATTLIST number:text-style number:language CDATA #IMPLIED>
-
-<!ATTLIST number:number-style number:country CDATA #IMPLIED>
-<!ATTLIST number:currency-style number:country CDATA #IMPLIED>
-<!ATTLIST number:percentage-style number:country CDATA #IMPLIED>
-<!ATTLIST number:date-style number:country CDATA #IMPLIED>
-<!ATTLIST number:time-style number:country CDATA #IMPLIED>
-<!ATTLIST number:boolean-style number:country CDATA #IMPLIED>
-<!ATTLIST number:text-style number:country CDATA #IMPLIED>
-
-<!ATTLIST number:number-style number:title CDATA #IMPLIED>
-<!ATTLIST number:currency-style number:title CDATA #IMPLIED>
-<!ATTLIST number:percentage-style number:title CDATA #IMPLIED>
-<!ATTLIST number:date-style number:title CDATA #IMPLIED>
-<!ATTLIST number:time-style number:title CDATA #IMPLIED>
-<!ATTLIST number:boolean-style number:title CDATA #IMPLIED>
-<!ATTLIST number:text-style number:title CDATA #IMPLIED>
-
-<!ATTLIST number:number-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:currency-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:percentage-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:date-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:time-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:boolean-style style:volatile %boolean; #IMPLIED>
-<!ATTLIST number:text-style style:volatile %boolean; #IMPLIED>
-
-<!ATTLIST number:currency-style number:automatic-order %boolean; "false">
-<!ATTLIST number:date-style number:automatic-order %boolean; "false">
-
-<!ATTLIST number:date-style number:format-source (fixed|language) "fixed">
-<!ATTLIST number:time-style number:format-source (fixed|language) "fixed">
-
-<!ATTLIST number:time-style number:truncate-on-overflow %boolean; "true">
-
-<!ATTLIST number:number number:decimal-places %integer; #IMPLIED>
-<!ATTLIST number:scientific-number number:decimal-places %integer; #IMPLIED>
-
-<!ATTLIST number:number number:min-integer-digits %integer; #IMPLIED>
-<!ATTLIST number:scientific-number number:min-integer-digits %integer; #IMPLIED>
-<!ATTLIST number:fraction number:min-integer-digits %integer; #IMPLIED>
-
-<!ATTLIST number:number number:grouping %boolean; "false">
-<!ATTLIST number:scientific-number number:grouping %boolean; "false">
-<!ATTLIST number:fraction number:grouping %boolean; "false">
-
-<!ATTLIST number:number number:decimal-replacement CDATA #IMPLIED>
-
-<!ATTLIST number:scientific-number number:min-exponent-digits %integer; #IMPLIED>
-
-<!ATTLIST number:fraction number:min-numerator-digits %integer; #IMPLIED>
-
-<!ATTLIST number:fraction number:min-denominator-digits %integer; #IMPLIED>
diff --git a/chart2/workbench/fileformat/drawing.mod b/chart2/workbench/fileformat/drawing.mod
index a149f2fd1be3..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/drawing.mod
+++ b/chart2/workbench/fileformat/drawing.mod
@@ -1,857 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: drawing.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!ENTITY % points "CDATA" >
-<!ENTITY % pathData "CDATA" >
-<!ENTITY % gradient-style "(linear|axial|radial|ellipsoid|square|rectangular)" >
-<!ENTITY % draw-position "svg:x %coordinate; #IMPLIED svg:y %coordinate; #IMPLIED">
-<!ENTITY % draw-end-position "table:end-cell-address %cell-address; #IMPLIED table:end-x %coordinate; #IMPLIED table:end-y %coordinate; #IMPLIED">
-<!ENTITY % draw-size "svg:width %coordinate; #IMPLIED svg:height %coordinate; #IMPLIED">
-<!ENTITY % draw-transform "draw:transform CDATA #IMPLIED">
-<!ENTITY % draw-viewbox "svg:viewBox CDATA #REQUIRED">
-<!ENTITY % draw-style-name "draw:style-name %styleName; #IMPLIED presentation:style-name %styleName; #IMPLIED draw:text-style-name %styleName; #IMPLIED">
-<!ENTITY % draw-shape-id "CDATA #IMPLIED" >
-<!ENTITY % draw-text "(text:p|text:unordered-list|text:ordered-list)*">
-<!ENTITY % zindex "draw:z-index %nonNegativeInteger; #IMPLIED">
-<!ENTITY % distance "CDATA">
-<!ENTITY % rectanglePoint "(top-left|top|top-right|left|center|right|bottom-left|bottom|bottom-right)">
-<!ENTITY % vector3D "CDATA">
-<!ENTITY % text-anchor "text:anchor-type %anchorType; #IMPLIED text:anchor-page-number %positiveInteger; #IMPLIED">
-<!ENTITY % layerName "CDATA">
-<!ENTITY % table-background "table:table-background (true | false) #IMPLIED">
-
-<!-- commont presentation shape attributes -->
-<!ENTITY % presentation-style-name "presentation:style-name %styleName; #IMPLIED">
-<!ENTITY % presentation-classes "(title|outline|subtitle|text|graphic|object|chart|table|orgchart|page|notes)" >
-<!-- ENTITY % presentation-class "presentation:class %presentation-classes; #IMPLIED" -->
-<!ENTITY % presentation-class "presentation:class %presentation-classes; #IMPLIED presentation:placeholder (true|false) #IMPLIED presentation:user-transformed (true|false) #IMPLIED">
-<!ENTITY % presentationEffects "(none|fade|move|stripes|open|close|dissolve|wavyline|random|lines|laser|appear|hide|move-short|checkerboard|rotate|stretch)" >
-<!ENTITY % presentationEffectDirections "(none|from-left|from-top|from-right|from-bottom|from-center|from-upper-left|from-upper-right|from-lower-left|from-lower-right|to-left|to-top|to-right|to-bottom|to-upper-left|to-upper-right|to-lower-right|to-lower-left|path|spiral-inward-left|spiral-inward-right|spiral-outward-left|spiral-outward-right|vertical|horizontal|to-center|clockwise|counter-clockwise)" >
-<!ENTITY % presentationSpeeds "(slow|medium|fast)" >
-
-<!-- Drawing shapes -->
-<!ELEMENT draw:rect ( office:events?, %draw-text; )>
-<!ATTLIST draw:rect %draw-position; >
-<!ATTLIST draw:rect %draw-end-position; >
-<!ATTLIST draw:rect %table-background; >
-<!ATTLIST draw:rect %draw-size; >
-<!ATTLIST draw:rect %draw-style-name; >
-<!ATTLIST draw:rect %draw-transform; >
-<!ATTLIST draw:rect draw:corner-radius %nonNegativeLength; #IMPLIED>
-<!ATTLIST draw:rect %zindex;>
-<!ATTLIST draw:rect draw:id %draw-shape-id;>
-<!ATTLIST draw:rect %text-anchor;>
-<!ATTLIST draw:rect draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:line ( office:events?, %draw-text; )>
-<!ATTLIST draw:line svg:x1 %length; #IMPLIED>
-<!ATTLIST draw:line svg:y1 %length; #IMPLIED>
-<!ATTLIST draw:line svg:x2 %length; #REQUIRED>
-<!ATTLIST draw:line svg:y2 %length; #REQUIRED>
-<!ATTLIST draw:line svg:y %coordinate; #IMPLIED>
-<!ATTLIST draw:line %draw-style-name; >
-<!ATTLIST draw:line %draw-transform; >
-<!ATTLIST draw:line %zindex;>
-<!ATTLIST draw:line %draw-end-position; >
-<!ATTLIST draw:line %table-background; >
-<!ATTLIST draw:line draw:id %draw-shape-id;>
-<!ATTLIST draw:line %text-anchor;>
-<!ATTLIST draw:line draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:polyline ( office:events?, %draw-text; )>
-<!ATTLIST draw:polyline %draw-position; >
-<!ATTLIST draw:polyline %draw-size; >
-<!ATTLIST draw:polyline %draw-viewbox; >
-<!ATTLIST draw:polyline draw:points %points; #REQUIRED>
-<!ATTLIST draw:polyline %draw-style-name; >
-<!ATTLIST draw:polyline %draw-transform; >
-<!ATTLIST draw:polyline %zindex;>
-<!ATTLIST draw:polyline %draw-end-position; >
-<!ATTLIST draw:polyline %table-background; >
-<!ATTLIST draw:polyline draw:id %draw-shape-id;>
-<!ATTLIST draw:polyline %text-anchor;>
-<!ATTLIST draw:polyline draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:polygon ( office:events?, %draw-text; )>
-<!ATTLIST draw:polygon %draw-position; >
-<!ATTLIST draw:polygon %draw-end-position; >
-<!ATTLIST draw:polygon %table-background; >
-<!ATTLIST draw:polygon %draw-size; >
-<!ATTLIST draw:polygon %draw-viewbox; >
-<!ATTLIST draw:polygon draw:points %points; #REQUIRED >
-<!ATTLIST draw:polygon %draw-style-name; >
-<!ATTLIST draw:polygon %draw-transform; >
-<!ATTLIST draw:polygon %zindex;>
-<!ATTLIST draw:polygon draw:id %draw-shape-id;>
-<!ATTLIST draw:polygon %text-anchor;>
-<!ATTLIST draw:polygon draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:path ( office:events?, %draw-text; )>
-<!ATTLIST draw:path %draw-position;>
-<!ATTLIST draw:path %draw-end-position; >
-<!ATTLIST draw:path %table-background; >
-<!ATTLIST draw:path %draw-size; >
-<!ATTLIST draw:path %draw-viewbox; >
-<!ATTLIST draw:path svg:d %pathData; #REQUIRED >
-<!ATTLIST draw:path %draw-style-name; >
-<!ATTLIST draw:path %draw-transform; >
-<!ATTLIST draw:path %zindex;>
-<!ATTLIST draw:path draw:id %draw-shape-id;>
-<!ATTLIST draw:path %text-anchor;>
-<!ATTLIST draw:path draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:circle ( office:events?, %draw-text; )>
-<!ATTLIST draw:circle %draw-position; >
-<!ATTLIST draw:circle %draw-size; >
-<!ATTLIST draw:circle %draw-style-name; >
-<!ATTLIST draw:circle %draw-transform; >
-<!ATTLIST draw:circle %zindex;>
-<!ATTLIST draw:circle %draw-end-position; >
-<!ATTLIST draw:circle %table-background; >
-<!ATTLIST draw:circle draw:id %draw-shape-id;>
-<!ATTLIST draw:circle draw:kind (full|section|cut|arc) "full">
-<!ATTLIST draw:circle draw:start-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:circle draw:end-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:circle %text-anchor;>
-<!ATTLIST draw:circle draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:ellipse ( office:events?, %draw-text; )>
-<!ATTLIST draw:ellipse %draw-position; >
-<!ATTLIST draw:ellipse %draw-size; >
-<!ATTLIST draw:ellipse %draw-style-name; >
-<!ATTLIST draw:ellipse %draw-transform; >
-<!ATTLIST draw:ellipse %zindex;>
-<!ATTLIST draw:ellipse %draw-end-position; >
-<!ATTLIST draw:ellipse %table-background; >
-<!ATTLIST draw:ellipse draw:id %draw-shape-id;>
-<!ATTLIST draw:ellipse draw:kind (full|section|cut|arc) "full">
-<!ATTLIST draw:ellipse draw:start-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:ellipse draw:end-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:ellipse %text-anchor;>
-<!ATTLIST draw:ellipse draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:connector ( office:events?, %draw-text;)>
-<!ATTLIST draw:connector draw:type (standard|lines|line|curve) "standard">
-<!ATTLIST draw:connector draw:line-skew CDATA #IMPLIED>
-<!ATTLIST draw:connector %draw-style-name;>
-<!ATTLIST draw:connector svg:x1 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector svg:y1 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector svg:x2 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector svg:y2 %coordinate; #REQUIRED>
-<!ATTLIST draw:connector draw:start-shape %draw-shape-id;>
-<!ATTLIST draw:connector draw:start-glue-point %integer; #IMPLIED>
-<!ATTLIST draw:connector draw:end-shape %draw-shape-id;>
-<!ATTLIST draw:connector draw:end-glue-point %integer; #IMPLIED>
-<!ATTLIST draw:connector %zindex;>
-<!ATTLIST draw:connector %draw-end-position; >
-<!ATTLIST draw:connector %table-background; >
-<!ATTLIST draw:connector draw:id %draw-shape-id;>
-<!ATTLIST draw:connector %text-anchor;>
-<!ATTLIST draw:connector draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:control EMPTY>
-<!ATTLIST draw:control %draw-style-name;>
-<!ATTLIST draw:control %draw-position; >
-<!ATTLIST draw:control %draw-size; >
-<!ATTLIST draw:control %control-id; >
-<!ATTLIST draw:control %zindex;>
-<!ATTLIST draw:control %draw-end-position; >
-<!ATTLIST draw:control %table-background; >
-<!ATTLIST draw:control draw:id %draw-shape-id;>
-<!ATTLIST draw:control %text-anchor;>
-<!ATTLIST draw:control draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:g ( office:events?, (%shapes;)* ) >
-<!ATTLIST draw:g svg:y %coordinate; #IMPLIED>
-<!ATTLIST draw:g %draw-transform; >
-<!ATTLIST draw:g %draw-style-name; >
-<!ATTLIST draw:g %zindex;>
-<!ATTLIST draw:g %draw-end-position; >
-<!ATTLIST draw:g %table-background; >
-<!ATTLIST draw:g draw:id %draw-shape-id;>
-<!ATTLIST draw:g %text-anchor;>
-<!ATTLIST draw:g draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:page-thumbnail EMPTY>
-<!ATTLIST draw:page-thumbnail draw:page-number %positiveInteger; #IMPLIED>
-<!ATTLIST draw:page-thumbnail %draw-position; >
-<!ATTLIST draw:page-thumbnail %draw-size; >
-<!ATTLIST draw:page-thumbnail %draw-style-name; >
-<!ATTLIST draw:page-thumbnail %presentation-class; >
-<!ATTLIST draw:page-thumbnail %zindex;>
-<!ATTLIST draw:page-thumbnail %draw-end-position; >
-<!ATTLIST draw:page-thumbnail %table-background; >
-<!ATTLIST draw:page-thumbnail draw:id %draw-shape-id;>
-<!ATTLIST draw:page-thumbnail %text-anchor;>
-<!ATTLIST draw:page-thumbnail draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT draw:caption ( office:events?, %draw-text;)>
-<!ATTLIST draw:caption %draw-position; >
-<!ATTLIST draw:caption %draw-end-position; >
-<!ATTLIST draw:caption %table-background; >
-<!ATTLIST draw:caption %draw-size; >
-<!ATTLIST draw:caption %draw-style-name; >
-<!ATTLIST draw:caption %draw-transform; >
-<!ATTLIST draw:caption draw:caption-point-x %coordinate; #IMPLIED>
-<!ATTLIST draw:caption draw:caption-point-y %coordinate; #IMPLIED>
-<!ATTLIST draw:caption %zindex;>
-<!ATTLIST draw:caption draw:id %draw-shape-id;>
-<!ATTLIST draw:caption %text-anchor;>
-<!ATTLIST draw:caption draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:caption draw:corner-radius %nonNegativeLength; #IMPLIED>
-
-<!ELEMENT draw:measure ( office:events?, %draw-text;)>
-<!ATTLIST draw:measure svg:x1 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure svg:y1 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure svg:x2 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure svg:y2 %coordinate; #REQUIRED>
-<!ATTLIST draw:measure %draw-end-position; >
-<!ATTLIST draw:measure %table-background; >
-<!ATTLIST draw:measure %draw-style-name; >
-<!ATTLIST draw:measure %draw-transform; >
-<!ATTLIST draw:measure %zindex;>
-<!ATTLIST draw:measure draw:id %draw-shape-id;>
-<!ATTLIST draw:measure %text-anchor;>
-<!ATTLIST draw:measure draw:layer %layerName; #IMPLIED>
-
-<!-- graphic style elements -->
-<!ELEMENT draw:gradient EMPTY >
-<!ATTLIST draw:gradient draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:gradient draw:style %gradient-style; #REQUIRED>
-<!ATTLIST draw:gradient draw:cx %coordinate; #IMPLIED>
-<!ATTLIST draw:gradient draw:cy %coordinate; #IMPLIED>
-<!ATTLIST draw:gradient draw:start-color %color; #IMPLIED>
-<!ATTLIST draw:gradient draw:end-color %color; #IMPLIED>
-<!ATTLIST draw:gradient draw:start-intensity %percentage; #IMPLIED>
-<!ATTLIST draw:gradient draw:end-intensity %percentage; #IMPLIED>
-<!ATTLIST draw:gradient draw:angle %integer; #IMPLIED>
-<!ATTLIST draw:gradient draw:border %percentage; #IMPLIED>
-
-<!ELEMENT draw:hatch EMPTY >
-<!ATTLIST draw:hatch draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:hatch draw:style (single|double|triple) #REQUIRED >
-<!ATTLIST draw:hatch draw:color %color; #IMPLIED>
-<!ATTLIST draw:hatch draw:distance %length; #IMPLIED>
-<!ATTLIST draw:hatch draw:rotation %integer; #IMPLIED>
-
-
-<!ELEMENT draw:fill-image EMPTY >
-<!ATTLIST draw:fill-image draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:fill-image xlink:href %uriReference; #REQUIRED>
-<!ATTLIST draw:fill-image xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:fill-image xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:fill-image xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:fill-image svg:width %length; #IMPLIED>
-<!ATTLIST draw:fill-image svg:height %length; #IMPLIED>
-
-<!ELEMENT draw:transparency EMPTY>
-<!ATTLIST draw:transparency draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:transparency draw:style %gradient-style; #REQUIRED>
-<!ATTLIST draw:transparency draw:cx %coordinate; #IMPLIED>
-<!ATTLIST draw:transparency draw:cy %coordinate; #IMPLIED>
-<!ATTLIST draw:transparency draw:start %percentage; #IMPLIED>
-<!ATTLIST draw:transparency draw:end %percentage; #IMPLIED>
-<!ATTLIST draw:transparency draw:angle %integer; #IMPLIED>
-<!ATTLIST draw:transparency draw:border %percentage; #IMPLIED>
-
-<!ELEMENT draw:marker EMPTY>
-<!ATTLIST draw:marker draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:marker %draw-viewbox; >
-<!ATTLIST draw:marker svg:d %pathData; #REQUIRED>
-
-<!ELEMENT draw:stroke-dash EMPTY>
-<!ATTLIST draw:stroke-dash draw:name %styleName; #REQUIRED>
-<!ATTLIST draw:stroke-dash draw:style (rect|round) #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots1 %integer; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots1-length %length; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots2 %integer; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:dots2-length %length; #IMPLIED>
-<!ATTLIST draw:stroke-dash draw:distance %length; #IMPLIED>
-
-<!-- stroke attributes -->
-<!ATTLIST style:properties draw:stroke (none|dash|solid) #IMPLIED>
-<!ATTLIST style:properties draw:stroke-dash CDATA #IMPLIED>
-<!ATTLIST style:properties svg:stroke-width %length; #IMPLIED>
-<!ATTLIST style:properties svg:stroke-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:marker-start %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:marker-end %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:marker-start-width %length; #IMPLIED>
-<!ATTLIST style:properties draw:marker-end-width %length; #IMPLIED>
-<!ATTLIST style:properties draw:marker-start-center %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:marker-end-center %boolean; #IMPLIED>
-<!ATTLIST style:properties svg:stroke-opacity %floatOrPercentage; #IMPLIED>
-<!ATTLIST style:properties svg:stroke-linejoin (miter|round|bevel|middle|none|inherit) #IMPLIED>
-
-<!-- text attributes -->
-<!ATTLIST style:properties draw:auto-grow-width %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:auto-grow-height %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fit-to-size %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fit-to-contour %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:textarea-horizontal-align ( left | center | right | justify ) #IMPLIED>
-<!ATTLIST style:properties draw:textarea-vertical-align ( top | middle | bottom ) #IMPLIED>
-
-<!-- fill attributes -->
-<!ATTLIST style:properties draw:fill (none|solid|bitmap|gradient|hatch) #IMPLIED>
-<!ATTLIST style:properties draw:fill-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:fill-gradient-name %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:gradient-step-count CDATA #IMPLIED>
-<!ATTLIST style:properties draw:fill-hatch-name %styleName; #IMPLIED>
-<!ATTLIST style:properties draw:fill-hatch-solid %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-name %styleName; #IMPLIED>
-<!ATTLIST style:properties style:repeat (no-repeat|repeat|stretch) #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-ref-point-x %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-ref-point-y %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:fill-image-ref-point %rectanglePoint; #IMPLIED>
-<!ATTLIST style:properties draw:tile-repeat-offset CDATA #IMPLIED>
-<!ATTLIST style:properties draw:transparency %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:transparency-name %styleName; #IMPLIED>
-
-<!-- graphic attributes -->
-<!ATTLIST style:properties draw:color-mode (greyscale|mono|watermark|standard) #IMPLIED>
-<!ATTLIST style:properties draw:luminance %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:contrast %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:gamma %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:red %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:green %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:blue %percentage; #IMPLIED>
-<!ATTLIST style:properties draw:color-inversion %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:mirror %boolean; #IMPLIED>
-
-<!-- shadow attributes -->
-<!ATTLIST style:properties draw:shadow (visible|hidden) #IMPLIED>
-<!ATTLIST style:properties draw:shadow-offset-x %length; #IMPLIED>
-<!ATTLIST style:properties draw:shadow-offset-y %length; #IMPLIED>
-<!ATTLIST style:properties draw:shadow-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:shadow-transparency CDATA #IMPLIED>
-
-<!-- connector attributes -->
-<!ATTLIST style:properties draw:start-line-spacing-horizontal %distance; #IMPLIED>
-<!ATTLIST style:properties draw:start-line-spacing-vertical %distance; #IMPLIED>
-<!ATTLIST style:properties draw:end-line-spacing-horizontal %distance; #IMPLIED>
-<!ATTLIST style:properties draw:end-line-spacing-vertical %distance; #IMPLIED>
-
-<!-- measure attributes -->
-<!ATTLIST style:properties draw:line-distance %distance; #IMPLIED>
-<!ATTLIST style:properties draw:guide-overhang %distance; #IMPLIED>
-<!ATTLIST style:properties draw:guide-distance %distance; #IMPLIED>
-<!ATTLIST style:properties draw:start-guide %distance; #IMPLIED>
-<!ATTLIST style:properties draw:end-guide %distance; #IMPLIED>
-<!ATTLIST style:properties draw:measure-align (automatic|left-outside|inside|right-outside) #IMPLIED>
-<!ATTLIST style:properties draw:measure-vertical-align (automatic|above|below|center) #IMPLIED>
-<!ATTLIST style:properties draw:unit (automatic|mm|cm|m|km|pt|pc|inch|ft|mi) #IMPLIED>
-<!ATTLIST style:properties draw:show-unit %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:placing (below|above) #IMPLIED>
-<!ATTLIST style:properties draw:parallel %boolean; #IMPLIED>
-
-<!-- frame attributes -->
-<!ATTLIST style:properties draw:frame-display-scrollbar %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:frame-display-border %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:frame-margin-horizontal %nonNegativePixelLength; #IMPLIED>
-<!ATTLIST style:properties draw:frame-margin-vertical %nonNegativePixelLength; #IMPLIED>
-<!ATTLIST style:properties draw:size-protect %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:move-protect %boolean; #IMPLIED>
-
-<!-- ole object attributes -->
-<!ATTLIST style:properties draw:visible-area-left %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties draw:visible-area-top %nonNegativeLength; #IMPLIED>
-<!ATTLIST style:properties draw:visible-area-width %positiveLength; #IMPLIED>
-<!ATTLIST style:properties draw:visible-area-height %positiveLength; #IMPLIED>
-
-<!-- fontwork attributes -->
-<!ATTLIST style:properties draw:fontwork-style (rotate|upright|slant-x|slant-y|none) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-adjust (left|right|autosize|center) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-distance %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-start %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-mirror %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-outline %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow (normal|slant|none) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-color %color; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-offset-x %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-offset-y %distance; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-form (none|top-circle|bottom-circle|left-circle|right-circle|top-arc|bottom-arc|left-arc|right-arc|button1|button2|button3|button4) #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-hide-form %boolean; #IMPLIED>
-<!ATTLIST style:properties draw:fontwork-shadow-transparence %percentage; #IMPLIED>
-
-<!-- caption attributes -->
-<!ATTLIST style:properties draw:caption-type (straight-line|angled-line|angled-connector-line) #IMPLIED>
-<!ATTLIST style:properties draw:caption-angle-type (fixed|free) #IMPLIED>
-<!ATTLIST style:properties draw:caption-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties draw:caption-gap %distance; #IMPLIED>
-<!ATTLIST style:properties draw:caption-escape-direction (horizontal|vertical|auto) #IMPLIED>
-<!ATTLIST style:properties draw:caption-escape %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties draw:caption-line-length %distance; #IMPLIED>
-<!ATTLIST style:properties draw:caption-fit-line-length %boolean; #IMPLIED>
-
-<!-- Animations -->
-<!ELEMENT presentation:sound EMPTY>
-<!ATTLIST presentation:sound xlink:href %uriReference; #REQUIRED>
-<!ATTLIST presentation:sound xlink:type (simple) #FIXED "simple">
-<!ATTLIST presentation:sound xlink:show (new|replace) #IMPLIED>
-<!ATTLIST presentation:sound xlink:actuate (onRequest) "onRequest">
-<!ATTLIST presentation:sound presentation:play-full %boolean; #IMPLIED>
-
-<!ELEMENT presentation:show-shape (presentation:sound)?>
-<!ATTLIST presentation:show-shape draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:show-shape presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:show-shape presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:show-shape presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:show-shape presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:show-shape presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:show-text (presentation:sound)?>
-<!ATTLIST presentation:show-text draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:show-text presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:show-text presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:show-text presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:show-text presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:show-text presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:hide-shape (presentation:sound)?>
-<!ATTLIST presentation:hide-shape draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:hide-shape presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:hide-shape presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:hide-shape presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:hide-shape presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:hide-shape presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:hide-text (presentation:sound)?>
-<!ATTLIST presentation:hide-text draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:hide-text presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:hide-text presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:hide-text presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:hide-text presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:hide-text presentation:path-id CDATA #IMPLIED >
-
-<!ELEMENT presentation:dim (presentation:sound)?>
-<!ATTLIST presentation:dim draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:dim draw:color %color; #REQUIRED>
-
-<!ELEMENT presentation:play EMPTY>
-<!ATTLIST presentation:play draw:shape-id CDATA #REQUIRED>
-<!ATTLIST presentation:play presentation:speed %presentationSpeeds; "medium">
-
-<!ELEMENT presentation:animations (presentation:show-shape|presentation:show-text|presentation:hide-shape|presentation:hide-text|presentation:dim|presentation:play)*>
-
-<!ELEMENT presentation:show EMPTY>
-<!ATTLIST presentation:show presentation:name %styleName; #REQUIRED>
-<!ATTLIST presentation:show presentation:pages CDATA #REQUIRED>
-
-<!ELEMENT presentation:settings (presentation:show)*>
-<!ATTLIST presentation:settings presentation:start-page %styleName; #IMPLIED>
-<!ATTLIST presentation:settings presentation:show %styleName; #IMPLIED>
-<!ATTLIST presentation:settings presentation:full-screen %boolean; "true">
-<!ATTLIST presentation:settings presentation:endless %boolean; "false">
-<!ATTLIST presentation:settings presentation:pause %timeDuration; #IMPLIED>
-<!ATTLIST presentation:settings presentation:show-logo %boolean; "false">
-<!ATTLIST presentation:settings presentation:force-manual %boolean; "false">
-<!ATTLIST presentation:settings presentation:mouse-visible %boolean; "true">
-<!ATTLIST presentation:settings presentation:mouse-as-pen %boolean; "false">
-<!ATTLIST presentation:settings presentation:start-with-navigator %boolean; "false">
-<!ATTLIST presentation:settings presentation:animations (enabled|disabled) "enabled">
-<!ATTLIST presentation:settings presentation:stay-on-top %boolean; "false">
-<!ATTLIST presentation:settings presentation:transition-on-click (enabled|disabled) "enabled">
-
-<!-- Drawing page -->
-<!ELEMENT draw:page (office:forms?,(%shapes;)*,presentation:animations?,presentation:notes?)>
-<!ATTLIST draw:page draw:name %string; #IMPLIED>
-<!ATTLIST draw:page draw:style-name %styleName; #IMPLIED>
-<!ATTLIST draw:page draw:master-page-name %styleName; #REQUIRED>
-<!ATTLIST draw:page presentation:presentation-page-layout-name %styleName; #IMPLIED>
-<!ATTLIST draw:page draw:id %nonNegativeInteger; #IMPLIED>
-<!ATTLIST draw:page xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:page xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:page xlink:show (replace) #IMPLIED>
-<!ATTLIST draw:page xlink:actuate (onRequest) #IMPLIED>
-
-<!-- Presentation notes -->
-<!ELEMENT presentation:notes (%shapes;)*>
-
-
-<!-- presentation page layouts -->
-<!ELEMENT style:presentation-page-layout (presentation:placeholder)* >
-<!ATTLIST style:presentation-page-layout style:name %styleName; #REQUIRED>
-<!ELEMENT presentation:placeholder EMPTY >
-<!ATTLIST presentation:placeholder presentation:object (title|outline|subtitle|text|graphic|object|chart|orgchart|page|notes|handout) #REQUIRED>
-<!ATTLIST presentation:placeholder svg:x %coordinateOrPercentage; #REQUIRED>
-<!ATTLIST presentation:placeholder svg:y %coordinateOrPercentage; #REQUIRED>
-<!ATTLIST presentation:placeholder svg:width %lengthOrPercentage; #REQUIRED>
-<!ATTLIST presentation:placeholder svg:height %lengthOrPercentage; #REQUIRED>
-
-<!-- presentation page attributes -->
-<!ATTLIST style:properties presentation:transition-type (manual|automatic|semi-automatic) #IMPLIED >
-<!ATTLIST style:properties presentation:transition-style (none|fade-from-left|fade-from-top|fade-from-right|fade-from-bottom|fade-to-center|fade-from-center|move-from-left|move-from-top|move-from-right|move-from-bottom|roll-from-top|roll-from-left|roll-from-right|roll-from-bottom|vertical-stripes|horizontal-stripes|clockwise|counterclockwise|fade-from-upperleft|fade-from-upperright|fade-from-lowerleft|fade-from-lowerright|close-vertical|close-horizontal|open-vertical|open-horizontal|spiralin-left|spiralin-right|spiralout-left|spiralout-right|dissolve|wavyline-from-left|wavyline-from-top|wavyline-from-right|wavyline-from-bottom|random|stretch-from-left|stretch-from-top|stretch-from-right|stretch-from-bottom|vertical-lines|horizontal-lines) #IMPLIED >
-<!ATTLIST style:properties presentation:transition-speed %presentationSpeeds; #IMPLIED >
-<!ATTLIST style:properties presentation:duration %timeDuration; #IMPLIED>
-<!ATTLIST style:properties presentation:visibility (visible|hidden) #IMPLIED>
-<!ATTLIST style:properties draw:background-size (full|border) #IMPLIED>
-<!ATTLIST style:properties presentation:background-objects-visible %boolean; #IMPLIED>
-<!ATTLIST style:properties presentation:background-visible %boolean; #IMPLIED>
-
-
-<!-- text boxes -->
-<!ELEMENT draw:text-box (office:events?,draw:image-map?,
- %sectionText;)>
-<!ATTLIST draw:text-box %draw-style-name;>
-<!ATTLIST draw:text-box %draw-transform; >
-<!ATTLIST draw:text-box draw:name %string; #IMPLIED>
-<!ATTLIST draw:text-box draw:chain-next-name %string; #IMPLIED>
-
-<!ATTLIST draw:text-box %text-anchor;>
-<!ATTLIST draw:text-box %draw-position;>
-<!ATTLIST draw:text-box %draw-end-position; >
-<!ATTLIST draw:text-box %table-background; >
-<!ATTLIST draw:text-box svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:text-box svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:text-box style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:text-box style:rel-height %percentage; #IMPLIED>
-<!ATTLIST draw:text-box fo:min-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:text-box %zindex;>
-<!ATTLIST draw:text-box %presentation-class; >
-<!ATTLIST draw:text-box %draw-transform; >
-<!ATTLIST draw:text-box draw:id %draw-shape-id;>
-<!ATTLIST draw:text-box draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:text-box draw:corner-radius %nonNegativeLength; #IMPLIED>
-
-<!-- image -->
-<!ELEMENT draw:image (office:binary-data?,office:events?,draw:image-map?,svg:desc?,(draw:contour-polygon|draw:contour-path)?)>
-<!ATTLIST draw:image %draw-style-name;>
-<!ATTLIST draw:image draw:name %string; #IMPLIED>
-<!ATTLIST draw:image xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:image xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:image xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:image xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:image draw:filter-name %string; #IMPLIED>
-<!ATTLIST draw:image %text-anchor;>
-<!ATTLIST draw:image %draw-position;>
-<!ATTLIST draw:image %draw-end-position; >
-<!ATTLIST draw:image %table-background; >
-<!ATTLIST draw:image svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:image svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:image %presentation-class; >
-<!ATTLIST draw:image %zindex;>
-<!ATTLIST draw:image draw:id %draw-shape-id;>
-<!ATTLIST draw:image draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:image style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:image style:rel-height %percentage; #IMPLIED>
-
-<!-- objects -->
-<!ELEMENT draw:thumbnail EMPTY>
-<!ATTLIST draw:thumbnail xlink:href %uriReference; #REQUIRED>
-<!ATTLIST draw:thumbnail xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:thumbnail xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:thumbnail xlink:actuate (onLoad) #IMPLIED>
-
-<!ELEMENT math:math ANY> <!-- dummy (we have no MathML DTD currently)-->
-<!ELEMENT draw:object (draw:thumbnail?,(office:document|math:math)?,office:events?, draw:image-map?, svg:desc?,(draw:contour-polygon|draw:contour-path)?)>
-<!ATTLIST draw:object %draw-style-name;>
-<!ATTLIST draw:object draw:name %string; #IMPLIED>
-<!ATTLIST draw:object xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:object xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:object xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:object xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:object %text-anchor;>
-<!ATTLIST draw:object %draw-position;>
-<!ATTLIST draw:object %draw-end-position; >
-<!ATTLIST draw:object %table-background; >
-<!ATTLIST draw:object svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object %presentation-class; >
-<!ATTLIST draw:object %zindex;>
-<!ATTLIST draw:object draw:id %draw-shape-id;>
-<!ATTLIST draw:object draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:object draw:notify-on-update-of-ranges %string; #IMPLIED>
-<!ATTLIST draw:object style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:object style:rel-height %percentage; #IMPLIED>
-
-<!ELEMENT draw:object-ole (office:binary-data?|office:events?|draw:image-map?|svg:desc?|draw:contour-polygon?|draw:contour-path?|draw:thumbnail?)>
-<!ATTLIST draw:object-ole draw:class-id CDATA #IMPLIED>
-<!ATTLIST draw:object-ole %draw-style-name;>
-<!ATTLIST draw:object-ole draw:name %string; #IMPLIED>
-<!ATTLIST draw:object-ole xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:object-ole xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:object-ole xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:object-ole xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:object-ole %text-anchor;>
-<!ATTLIST draw:object-ole %draw-position;>
-<!ATTLIST draw:object-ole %draw-end-position; >
-<!ATTLIST draw:object-ole %table-background; >
-<!ATTLIST draw:object-ole svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object-ole svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:object-ole %presentation-class; >
-<!ATTLIST draw:object-ole %zindex;>
-<!ATTLIST draw:object-ole draw:id %draw-shape-id;>
-<!ATTLIST draw:object-ole draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:object-ole style:rel-width %percentage; #IMPLIED>
-<!ATTLIST draw:object-ole style:rel-height %percentage; #IMPLIED>
-
-<!ELEMENT svg:desc (#PCDATA)>
-
-<!ELEMENT draw:contour-polygon EMPTY>
-<!ATTLIST draw:contour-polygon svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-polygon svg:height %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-polygon %draw-viewbox;>
-<!ATTLIST draw:contour-polygon draw:points %points; #REQUIRED>
-<!ATTLIST draw:contour-polygon draw:recreate-on-edit %boolean; #IMPLIED>
-
-<!ELEMENT draw:contour-path EMPTY>
-<!ATTLIST draw:contour-path svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-path svg:height %coordinate; #REQUIRED>
-<!ATTLIST draw:contour-path %draw-viewbox;>
-<!ATTLIST draw:contour-path svg:d %pathData; #REQUIRED>
-<!ATTLIST draw:contour-path draw:recreate-on-edit %boolean; #IMPLIED>
-
-<!-- hyperlink -->
-<!ELEMENT draw:a (draw:image|draw:text-box)>
-<!ATTLIST draw:a xlink:href %uriReference; #REQUIRED>
-<!ATTLIST draw:a xlink:type (simple) #FIXED "simple">
-<!ATTLIST draw:a xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:a xlink:actuate (onRequest) "onRequest">
-<!ATTLIST draw:a office:name %string; #IMPLIED>
-<!ATTLIST draw:a office:target-frame-name %string; #IMPLIED>
-<!ATTLIST draw:a office:server-map %boolean; "false">
-
-<!-- 3d properties -->
-<!ATTLIST style:properties dr3d:horizontal-segments %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties dr3d:vertical-segments %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties dr3d:edge-rounding %percentage; #IMPLIED>
-<!ATTLIST style:properties dr3d:edge-rounding-mode (correct|attractive) #IMPLIED>
-<!ATTLIST style:properties dr3d:back-scale %percentage; #IMPLIED>
-<!ATTLIST style:properties dr3d:end-angle %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties dr3d:depth %length; #IMPLIED>
-<!ATTLIST style:properties dr3d:backface-culling (enabled|disabled) #IMPLIED>
-<!ATTLIST style:properties dr3d:lighting-mode (standard|double-sided) #IMPLIED>
-<!ATTLIST style:properties dr3d:normals-kind (object|flat|sphere) #IMPLIED>
-<!ATTLIST style:properties dr3d:normals-direction (normal|inverse) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-generation-mode-x (object|parallel|sphere) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-generation-mode-y (object|parallel|sphere) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-kind (luminance|intesity|color) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-filter (enabled|disabled) #IMPLIED>
-<!ATTLIST style:properties dr3d:texture-mode (replace|modulate|blend) #IMPLIED>
-<!ATTLIST style:properties dr3d:ambient-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:emissive-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:specular-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:diffuse-color %color; #IMPLIED>
-<!ATTLIST style:properties dr3d:shininess %percentage; #IMPLIED>
-<!ATTLIST style:properties dr3d:shadow (visible|hidden) #IMPLIED>
-
-<!ELEMENT dr3d:light EMPTY>
-<!ATTLIST dr3d:light dr3d:diffuse-color %color; #IMPLIED>
-<!ATTLIST dr3d:light dr3d:direction %vector3D; #REQUIRED>
-<!ATTLIST dr3d:light dr3d:enabled %boolean; #IMPLIED>
-<!ATTLIST dr3d:light dr3d:specular %boolean; #IMPLIED>
-
-<!ENTITY % shapes3d "(dr3d:scene|dr3d:extrude|dr3d:sphere|dr3d:rotate|dr3d:cube)">
-
-<!ELEMENT dr3d:cube EMPTY>
-<!ATTLIST dr3d:cube dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:cube dr3d:min-edge %vector3D; #IMPLIED>
-<!ATTLIST dr3d:cube dr3d:max-edge %vector3D; #IMPLIED>
-<!ATTLIST dr3d:cube %zindex;>
-<!ATTLIST dr3d:cube draw:id %draw-shape-id;>
-<!ATTLIST dr3d:cube %draw-end-position; >
-<!ATTLIST dr3d:cube %table-background; >
-<!ATTLIST dr3d:cube %draw-style-name; >
-<!ATTLIST dr3d:cube draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:sphere EMPTY>
-<!ATTLIST dr3d:sphere dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:sphere dr3d:center %vector3D; #IMPLIED>
-<!ATTLIST dr3d:sphere dr3d:size %vector3D; #IMPLIED>
-<!ATTLIST dr3d:sphere %zindex;>
-<!ATTLIST dr3d:sphere draw:id %draw-shape-id;>
-<!ATTLIST dr3d:sphere %draw-end-position; >
-<!ATTLIST dr3d:sphere %table-background; >
-<!ATTLIST dr3d:sphere %draw-style-name; >
-<!ATTLIST dr3d:sphere draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:extrude EMPTY>
-<!ATTLIST dr3d:extrude dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:extrude %draw-viewbox;>
-<!ATTLIST dr3d:extrude svg:d %pathData; #REQUIRED >
-<!ATTLIST dr3d:extrude %zindex;>
-<!ATTLIST dr3d:extrude draw:id %draw-shape-id;>
-<!ATTLIST dr3d:extrude %draw-end-position; >
-<!ATTLIST dr3d:extrude %table-background; >
-<!ATTLIST dr3d:extrude %draw-style-name; >
-<!ATTLIST dr3d:extrude draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:rotate EMPTY>
-<!ATTLIST dr3d:rotate dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:rotate %draw-viewbox;>
-<!ATTLIST dr3d:rotate svg:d %pathData; #REQUIRED >
-<!ATTLIST dr3d:rotate %zindex;>
-<!ATTLIST dr3d:rotate draw:id %draw-shape-id;>
-<!ATTLIST dr3d:rotate %draw-end-position; >
-<!ATTLIST dr3d:rotate %table-background; >
-<!ATTLIST dr3d:rotate %draw-style-name; >
-<!ATTLIST dr3d:rotate draw:layer %layerName; #IMPLIED>
-
-<!ELEMENT dr3d:scene (dr3d:light*,(%shapes3d;)*)>
-<!ATTLIST dr3d:scene %draw-style-name; >
-<!ATTLIST dr3d:scene svg:x %coordinate; #IMPLIED>
-<!ATTLIST dr3d:scene svg:y %coordinate; #IMPLIED>
-<!ATTLIST dr3d:scene svg:width %length; #IMPLIED>
-<!ATTLIST dr3d:scene svg:height %length; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:vrp %vector3D; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:vpn %vector3D; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:vup %vector3D; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:projection (parallel|perspective) #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:transform CDATA #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:distance %length; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:focal-length %length; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:shadow-slant %nonNegativeInteger; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:shade-mode (flat|phong|gouraud|draft) #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:ambient-color %color; #IMPLIED>
-<!ATTLIST dr3d:scene dr3d:lighting-mode %boolean; #IMPLIED>
-<!ATTLIST dr3d:scene %zindex;>
-<!ATTLIST dr3d:scene draw:id %draw-shape-id;>
-<!ATTLIST dr3d:scene %draw-end-position; >
-<!ATTLIST dr3d:scene %table-background; >
-
-<!-- layer -->
-
-<!ELEMENT draw:layer-set (draw:layer*)>
-
-<!ELEMENT draw:layer EMPTY>
-<!ATTLIST draw:layer draw:name %layerName; #REQUIRED>
-
-<!-- events -->
-<!ELEMENT presentation:event (presentation:sound)?>
-<!ATTLIST presentation:event %event-name;>
-<!ATTLIST presentation:event presentation:action (none|previous-page|next-page|first-page|last-page|hide|stop|execute|show|verb|fade-out|sound) #REQUIRED>
-<!ATTLIST presentation:event presentation:effect %presentationEffects; "none">
-<!ATTLIST presentation:event presentation:direction %presentationEffectDirections; "none">
-<!ATTLIST presentation:event presentation:speed %presentationSpeeds; "medium">
-<!ATTLIST presentation:event presentation:start-scale %percentage; "100%">
-<!ATTLIST presentation:event xlink:href %uriReference; #IMPLIED>
-<!ATTLIST presentation:event xlink:type (simple) #IMPLIED>
-<!ATTLIST presentation:event xlink:show (embed) #IMPLIED>
-<!ATTLIST presentation:event xlink:actuate (onRequest) #IMPLIED>
-<!ATTLIST presentation:event presentation:verb %nonNegativeInteger; #IMPLIED>
-
-<!-- applets -->
-<!ELEMENT draw:applet (draw:thumbnail?, draw:param*, svg:desc?)>
-<!ATTLIST draw:applet xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:applet xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:applet xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:applet xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:applet draw:code CDATA #REQUIRED>
-<!ATTLIST draw:applet draw:object CDATA #IMPLIED>
-<!ATTLIST draw:applet draw:archive CDATA #IMPLIED>
-<!ATTLIST draw:applet draw:may-script %boolean; "false">
-<!ATTLIST draw:applet draw:name CDATA #IMPLIED>
-<!ATTLIST draw:applet %draw-style-name;>
-<!ATTLIST draw:applet svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:applet svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:applet %zindex;>
-<!ATTLIST draw:applet draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:applet %draw-position;>
-<!ATTLIST draw:applet %draw-end-position; >
-
-<!-- plugins -->
-<!ELEMENT draw:plugin (draw:thumbnail?, draw:param*, svg:desc?)>
-<!ATTLIST draw:plugin xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:plugin xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:plugin xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:plugin xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:plugin draw:mime-type CDATA #IMPLIED>
-<!ATTLIST draw:plugin draw:name CDATA #IMPLIED>
-<!ATTLIST draw:plugin %draw-style-name;>
-<!ATTLIST draw:plugin svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:plugin svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:plugin %zindex;>
-<!ATTLIST draw:plugin draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:plugin %draw-position;>
-<!ATTLIST draw:plugin %draw-end-position; >
-
-<!-- Paramaters -->
-<!ELEMENT draw:param EMPTY>
-<!ATTLIST draw:param draw:name CDATA #IMPLIED>
-<!ATTLIST draw:param draw:value CDATA #IMPLIED>
-
-<!-- Floating Frames -->
-<!ELEMENT draw:floating-frame (draw:thumbnail?, svg:desc?)>
-<!ATTLIST draw:floating-frame xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:floating-frame xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:floating-frame xlink:show (embed) #IMPLIED>
-<!ATTLIST draw:floating-frame xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST draw:floating-frame draw:name CDATA #IMPLIED>
-<!ATTLIST draw:floating-frame draw:frame-name CDATA #IMPLIED>
-<!ATTLIST draw:floating-frame %draw-style-name;>
-<!ATTLIST draw:floating-frame svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:floating-frame svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST draw:floating-frame %zindex;>
-<!ATTLIST draw:floating-frame draw:layer %layerName; #IMPLIED>
-<!ATTLIST draw:floating-frame %draw-position;>
-<!ATTLIST draw:floating-frame %draw-end-position; >
-
-<!-- Image Maps -->
-<!ELEMENT draw:image-map
- (draw:area-rectangle|draw:area-circle|draw:area-polygon)*>
-
-<!ELEMENT draw:area-rectangle (svg:desc?,office:events?)>
-<!ATTLIST draw:area-rectangle xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:area-rectangle xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:area-rectangle office:target-frame-name CDATA #IMPLIED>
-<!ATTLIST draw:area-rectangle xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:area-rectangle office:name CDATA #IMPLIED>
-<!ATTLIST draw:area-rectangle draw:nohref (nohref) #IMPLIED>
-<!ATTLIST draw:area-rectangle svg:x %coordinate; #REQUIRED>
-<!ATTLIST draw:area-rectangle svg:y %coordinate; #REQUIRED>
-<!ATTLIST draw:area-rectangle svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:area-rectangle svg:height %coordinate; #REQUIRED>
-
-<!ELEMENT draw:area-circle (svg:desc?,office:events?)>
-<!ATTLIST draw:area-circle xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:area-circle xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:area-circle office:target-frame-name CDATA #IMPLIED>
-<!ATTLIST draw:area-circle xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:area-circle office:name CDATA #IMPLIED>
-<!ATTLIST draw:area-circle draw:nohref (nohref) #IMPLIED>
-<!ATTLIST draw:area-circle svg:cx %coordinate; #REQUIRED>
-<!ATTLIST draw:area-circle svg:cy %coordinate; #REQUIRED>
-<!ATTLIST draw:area-circle svg:r %coordinate; #REQUIRED>
-
-<!ELEMENT draw:area-polygon (svg:desc?,office:events?)>
-<!ATTLIST draw:area-polygon xlink:href %uriReference; #IMPLIED>
-<!ATTLIST draw:area-polygon xlink:type (simple) #IMPLIED>
-<!ATTLIST draw:area-polygon office:target-frame-name CDATA #IMPLIED>
-<!ATTLIST draw:area-polygon xlink:show (new|replace) #IMPLIED>
-<!ATTLIST draw:area-polygon office:name CDATA #IMPLIED>
-<!ATTLIST draw:area-polygon draw:nohref (nohref) #IMPLIED>
-<!ATTLIST draw:area-polygon svg:x %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:y %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:width %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:height %coordinate; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:points %points; #REQUIRED>
-<!ATTLIST draw:area-polygon svg:viewBox CDATA #REQUIRED>
diff --git a/chart2/workbench/fileformat/dtypes.mod b/chart2/workbench/fileformat/dtypes.mod
index ecb66be044c2..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/dtypes.mod
+++ b/chart2/workbench/fileformat/dtypes.mod
@@ -1,147 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: dtypes.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!-- datatypes corresponding to XML Schema Part 2 W3C Working draft of -->
-<!-- 07 April 2000 -->
-
-<!-- string -->
-<!ENTITY % string "CDATA">
-<!ENTITY % cString "#PCDATA">
-
-<!-- boolean (values are "true" and "false" -->
-<!ENTITY % boolean "CDATA">
-
-<!-- integer ( ..., -2, -1, 0, 1, 2, ...) -->
-<!ENTITY % integer "CDATA">
-
-<!-- non negative integer ( 0, 1, 2, ...) -->
-<!ENTITY % nonNegativeInteger "CDATA">
-
-<!-- positive integer ( 1, 2, ...) -->
-<!ENTITY % positiveInteger "CDATA">
-<!ENTITY % cPositiveInteger "#PCDATA">
-
-<!ENTITY % positiveNumberOrDefault "CDATA">
-
-<!-- time duration as specified by ISO8601, section 5.5.3.2 -->
-<!ENTITY % timeDuration "CDATA">
-<!ENTITY % cTimeDuration "#PCDATA">
-
-<!-- time instance as specified by ISO8601, section 5.4 -->
-<!ENTITY % timeInstance "CDATA">
-<!ENTITY % cTimeInstance "#PCDATA">
-
-<!-- date instance as specified by ISO8601, section 5.2.1.1, extended format-->
-<!ENTITY % date "CDATA">
-<!ENTITY % cDate "#PCDATA">
-
-<!-- date duration, like timDuration but truncated to full dates -->
-<!ENTITY % dateDuration "CDATA">
-<!ENTITY % cDateDuration "#PCDATA">
-
-<!-- URI reference -->
-<!ENTITY % uriReference "CDATA">
-
-<!-- language code as specified by RFC1766 -->
-<!ENTITY % language "CDATA">
-<!ENTITY % cLanguage "#PCDATA">
-
-<!-- float -->
-<!ENTITY % float "CDATA">
-
-<!-- Some other common used data types -->
-
-<!-- a single UNICODE character -->
-<!ENTITY % character "CDATA">
-
-<!-- a style name -->
-<!ENTITY % styleName "CDATA">
-
-<!-- a target frame mame -->
-<!ENTITY % targetFrameName "CDATA">
-
-<!-- a language without a country as specified by ISO639 -->
-<!ENTITY % languageOnly "CDATA">
-
-<!-- a country as specified by ISO3166 -->
-<!ENTITY % country "CDATA">
-
-<!-- a color value having the format #rrggbb -->
-<!ENTITY % color "CDATA">
-<!-- a color value having the format #rrggbb or "transparent" -->
-<!ENTITY % transparentOrColor "CDATA">
-
-<!-- a percentage -->
-<!ENTITY % percentage "CDATA">
-
-<!-- a length (i.e. 1cm or .6inch) -->
-<!ENTITY % length "CDATA">
-<!ENTITY % positiveLength "CDATA">
-<!ENTITY % nonNegativeLength "CDATA">
-<!ENTITY % lengthOrNoLimit "CDATA">
-
-<!-- a length or a percentage -->
-<!ENTITY % lengthOrPercentage "CDATA">
-<!ENTITY % positiveLengthOrPercentage "CDATA">
-
-<!-- a pixel length (i.e. 2px) -->
-<!ENTITY % nonNegativePixelLength "CDATA">
-
-<!-- a float or a percentage -->
-<!ENTITY % floatOrPercentage "CDATA">
-
-<!-- a text encoding -->
-<!ENTITY % textEncoding "CDATA">
-
-<!-- cell address and cell range address -->
-<!ENTITY % cell-address "CDATA">
-<!ENTITY % cell-range-address "CDATA">
-<!ENTITY % cell-range-address-list "CDATA">
-
-<!-- value types -->
-<!ENTITY % valueType "(float|time|date|percentage|currency|boolean|string)">
-
-<!-- an svg coordinate in different distance formats -->
-<!ENTITY % coordinate "CDATA">
-
-<!ENTITY % coordinateOrPercentage "CDATA">
-
-<!ENTITY % shape "draw:rect|draw:line|draw:polyline|draw:polygon|draw:path|
- draw:circle|draw:ellipse|draw:g|draw:page-thumbnail|
- draw:text-box|draw:image|draw:object|draw:object-ole|
- draw:applet|draw:floating-frame|draw:plugin|
- draw:measure|draw:caption|draw:connector|
- dr3d:scene|draw:control" >
-<!ENTITY % shapes "(%shape;)" >
-
-<!ENTITY % anchorType "(page|frame|paragraph|char|as-char)">
-
-<!ENTITY % control-id "form:id CDATA #REQUIRED">
diff --git a/chart2/workbench/fileformat/form.mod b/chart2/workbench/fileformat/form.mod
index 7c39fe5fd43b..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/form.mod
+++ b/chart2/workbench/fileformat/form.mod
@@ -1,312 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: form.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!ENTITY % controls "form:text|form:textarea|form:fixed-text|form:file|
- form:password|form:formatted-text|form:button|form:image|
- form:checkbox|form:radio|form:listbox|form:combobox|form:frame|
- form:hidden|form:image-frame|form:grid|form:generic-control">
-
-<!ENTITY % name "form:name CDATA #IMPLIED">
-<!ENTITY % service-name "form:service-name CDATA #IMPLIED">
-
-<!ENTITY % navigation "(none|current|parent)">
-<!ENTITY % cycles "(records|current|page)">
-<!ENTITY % url "CDATA">
-
-
-<!ENTITY % types "(submit|reset|push|url)">
-<!ENTITY % button-type "form:button-type %types; 'push'">
-<!ENTITY % current-selected "form:current-selected %boolean; 'false'">
-<!ENTITY % current-value "form:current-value CDATA #IMPLIED">
-<!ENTITY % value "form:value CDATA #IMPLIED">
-<!ENTITY % disabled "form:disabled %boolean; 'false'">
-<!ENTITY % dropdown "form:dropdown %boolean; 'false'">
-<!ENTITY % for "form:for CDATA #IMPLIED">
-<!ENTITY % image-data "form:image-data %url; #IMPLIED">
-<!ENTITY % label "form:label CDATA #IMPLIED">
-<!ENTITY % max-length "form:max-length CDATA #IMPLIED">
-<!ENTITY % printable "form:printable %boolean; 'true'">
-<!ENTITY % readonly "form:readonly %boolean; 'false'">
-<!ENTITY % size "form:size CDATA #IMPLIED">
-<!ENTITY % selected "form:selected %boolean; 'false'">
-<!ENTITY % size "form:size CDATA #IMPLIED">
-<!ENTITY % tab-index "form:tab-index CDATA #IMPLIED">
-<!ENTITY % target-frame "office:target-frame CDATA '_blank'">
-<!ENTITY % target-location "xlink:href %url; #IMPLIED">
-<!ENTITY % tab-stop "form:tab-stop %boolean; 'true'">
-<!ENTITY % title "form:title CDATA #IMPLIED">
-<!ENTITY % default-value "form:default-value CDATA #IMPLIED">
-<!ENTITY % bound-column "form:bound-column CDATA #IMPLIED">
-<!ENTITY % convert-empty "form:convert-empty-to-null %boolean; 'false'">
-<!ENTITY % data-field "form:data-field CDATA #IMPLIED">
-<!ENTITY % list-source "form:list-source CDATA #IMPLIED">
-<!ENTITY % list-source-types "(table|query|sql|sql-pass-through|value-list|table-fields)">
-<!ENTITY % list-source-type "form:list-source-type %list-source-types; #IMPLIED">
-
-<!ELEMENT form:control (%controls;)+>
-<!ATTLIST form:control %name;
- %service-name;
- %control-id;>
-
-<!ELEMENT form:form (form:properties?, office:events?, (form:control|form:form)*)>
-<!ATTLIST form:form %name; %service-name;>
-<!ATTLIST form:form xlink:href %url; #IMPLIED>
-<!ATTLIST form:form form:enctype CDATA "application/x-www-form-urlencoded">
-<!ATTLIST form:form form:method CDATA "get">
-<!ATTLIST form:form office:target-frame CDATA "_blank">
-<!ATTLIST form:form form:allow-deletes %boolean; "true">
-<!ATTLIST form:form form:allow-inserts %boolean; "true">
-<!ATTLIST form:form form:allow-updates %boolean; "true">
-<!ATTLIST form:form form:apply-filter %boolean; "false">
-<!ATTLIST form:form form:command CDATA #IMPLIED>
-<!ATTLIST form:form form:command-type (table|query|command) "command">
-<!ATTLIST form:form form:datasource CDATA #IMPLIED>
-<!ATTLIST form:form form:detail-fields CDATA #IMPLIED>
-<!ATTLIST form:form form:escape-processing %boolean; "true">
-<!ATTLIST form:form form:filter CDATA #IMPLIED>
-<!ATTLIST form:form form:ignore-result %boolean; "false">
-<!ATTLIST form:form form:master-fields CDATA #IMPLIED>
-<!ATTLIST form:form form:navigation-mode %navigation; #IMPLIED>
-<!ATTLIST form:form form:order CDATA #IMPLIED>
-<!ATTLIST form:form form:tab-cycle %cycles; #IMPLIED>
-
-<!ELEMENT office:forms (form:form*)>
-<!ATTLIST office:forms form:automatic-focus %boolean; "false">
-<!ATTLIST office:forms form:apply-design-mode %boolean; "true">
-
-<!ELEMENT form:text (form:properties?, office:events?)>
-<!ATTLIST form:text %current-value;
- %disabled;
- %max-length;
- %printable;
- %readonly;
- %tab-index;
- %tab-stop;
- %title;
- %value;
- %convert-empty;
- %data-field;>
-
-<!ELEMENT form:textarea (form:properties?, office:events?)>
-<!ATTLIST form:textarea %current-value;
- %disabled;
- %max-length;
- %printable;
- %readonly;
- %tab-index;
- %tab-stop;
- %title;
- %value;
- %convert-empty;
- %data-field;>
-
-<!ELEMENT form:password (form:properties?, office:events?)>
-<!ATTLIST form:password %disabled;
- %max-length;
- %printable;
- %tab-index;
- %tab-stop;
- %title;
- %value;
- %convert-empty;>
-
-<!ATTLIST form:password form:echo-char CDATA "*">
-
-<!ELEMENT form:file (form:properties?, office:events?)>
-<!ATTLIST form:file %current-value;
- %disabled;
- %max-length;
- %printable;
- %readonly;
- %tab-index;
- %tab-stop;
- %title;
- %value;>
-
-<!ELEMENT form:formatted-text (form:properties?, office:events?)>
-<!ATTLIST form:formatted-text %current-value;
- %disabled;
- %max-length;
- %printable;
- %readonly;
- %tab-index;
- %tab-stop;
- %title;
- %value;
- %convert-empty;
- %data-field;>
-<!ATTLIST form:formatted-text form:max-value CDATA #IMPLIED>
-<!ATTLIST form:formatted-text form:min-value CDATA #IMPLIED>
-<!ATTLIST form:formatted-text form:validation %boolean; "false">
-
-<!ELEMENT form:fixed-text (form:properties?, office:events?)>
-<!ATTLIST form:fixed-text %for;
- %disabled;
- %label;
- %printable;
- %title;>
-<!ATTLIST form:fixed-text form:multi-line %boolean; "false">
-
-<!ELEMENT form:combobox (form:properties?, office:events?, form:item*)>
-<!ATTLIST form:combobox %current-value;
- %disabled;
- %dropdown;
- %max-length;
- %printable;
- %readonly;
- %size;
- %tab-index;
- %tab-stop;
- %title;
- %value;
- %convert-empty;
- %data-field;
- %list-source;
- %list-source-type;>
-<!ATTLIST form:combobox form:auto-complete %boolean; #IMPLIED>
-
-<!ELEMENT form:item (#PCDATA)>
-<!ATTLIST form:item %label;>
-
-<!ELEMENT form:listbox (form:properties?, office:events?, form:option*)>
-<!ATTLIST form:listbox %disabled;
- %dropdown;
- %printable;
- %size;
- %tab-index;
- %tab-stop;
- %title;
- %bound-column;
- %data-field;
- %list-source;
- %list-source-type;>
-<!ATTLIST form:listbox form:multiple %boolean; "false">
-
-<!ELEMENT form:option (#PCDATA)>
-<!ATTLIST form:option %current-selected;
- %selected;
- %label;
- %value;>
-
-<!ELEMENT form:button (form:properties?, office:events?)>
-<!ATTLIST form:button %button-type;
- %disabled;
- %label;
- %image-data;
- %printable;
- %tab-index;
- %tab-stop;
- %target-frame;
- %target-location;
- %title;
- %value;>
-<!ATTLIST form:button form:default-button %boolean; "false">
-
-<!ELEMENT form:image (form:properties?, office:events?)>
-<!ATTLIST form:image %button-type;
- %disabled;
- %image-data;
- %printable;
- %tab-index;
- %tab-stop;
- %target-frame;
- %target-location;
- %title;
- %value;>
-
-<!ELEMENT form:checkbox (form:properties?, office:events?)>
-<!ATTLIST form:checkbox %disabled;
- %label;
- %printable;
- %tab-index;
- %tab-stop;
- %title;
- %value;
- %data-field;>
-<!ENTITY % states "(unchecked|checked|unknown)">
-<!ATTLIST form:checkbox form:current-state %states; #IMPLIED>
-<!ATTLIST form:checkbox form:is-tristate %boolean; "false">
-<!ATTLIST form:checkbox form:state %states; "unchecked">
-
-<!ELEMENT form:radio (form:properties?, office:events?)>
-<!ATTLIST form:radio %current-selected;
- %disabled;
- %label;
- %printable;
- %selected;
- %tab-index;
- %tab-stop;
- %title;
- %value;
- %data-field;>
-
-<!ELEMENT form:frame (form:properties?, office:events?)>
-<!ATTLIST form:frame %disabled;
- %for;
- %label;
- %printable;
- %title;>
-
-<!ELEMENT form:image-frame (form:properties?, office:events?)>
-<!ATTLIST form:image-frame %disabled;
- %image-data;
- %printable;
- %readonly;
- %title;
- %data-field;>
-
-<!ELEMENT form:hidden (form:properties?, office:events?)>
-<!ATTLIST form:hidden %name;
- %service-name;
- %value;>
-
-<!ELEMENT form:grid (form:properties?, office:events?, form:column*)>
-<!ATTLIST form:grid %disabled;
- %printable;
- %tab-index;
- %tab-stop;
- %title;>
-<!ENTITY % column-type "form:text| form:textarea| form:formatted-text|form:checkbox| form:listbox| form:combobox">
-<!ELEMENT form:column (%column-type;)+>
-<!ATTLIST form:column %name;
- %service-name;
- %label;>
-
-<!ELEMENT form:generic-control (form:properties?, office:events?)>
-
-
-<!ELEMENT form:properties (form:property+)>
-<!ELEMENT form:property (form:property-value*)>
-<!ATTLIST form:property form:property-is-list %boolean; #IMPLIED>
-<!ATTLIST form:property form:property-name CDATA #REQUIRED>
-<!ATTLIST form:property form:property-type (boolean|short|int|long|double|string) #REQUIRED>
-<!ELEMENT form:property-value (#PCDATA)>
-
diff --git a/chart2/workbench/fileformat/meta.mod b/chart2/workbench/fileformat/meta.mod
index 0bef2535bcbf..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/meta.mod
+++ b/chart2/workbench/fileformat/meta.mod
@@ -1,94 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: meta.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-
-<!ELEMENT meta:generator (%cString;)>
-
-<!ELEMENT dc:title (%cString;)>
-
-<!ELEMENT dc:description (%cString;)>
-
-<!ELEMENT dc:subject (%cString;)>
-
-<!ELEMENT meta:keywords (meta:keyword)*>
-<!ELEMENT meta:keyword (%cString;)>
-
-<!ELEMENT meta:initial-creator (%cString;)>
-
-<!ELEMENT dc:creator (%cString;)>
-
-<!ELEMENT meta:printed-by (%cString;)>
-
-<!ELEMENT meta:creation-date (%cTimeInstance;)>
-
-<!ELEMENT dc:date (%cTimeInstance;)>
-
-<!ELEMENT meta:print-date (%cTimeInstance;)>
-
-<!ELEMENT meta:template EMPTY>
-<!ATTLIST meta:template xlink:type (simple) #FIXED "simple">
-<!ATTLIST meta:template xlink:actuate (onRequest) "onRequest">
-<!ATTLIST meta:template xlink:href %uriReference; #REQUIRED>
-<!ATTLIST meta:template xlink:title %string; #IMPLIED>
-<!ATTLIST meta:template meta:date %timeInstance; #IMPLIED>
-
-<!ELEMENT meta:auto-reload EMPTY>
-<!ATTLIST meta:auto-reload xlink:type (simple) #IMPLIED>
-<!ATTLIST meta:auto-reload xlink:show (replace) #IMPLIED>
-<!ATTLIST meta:auto-reload xlink:actuate (onLoad) #IMPLIED>
-<!ATTLIST meta:auto-reload xlink:href %uriReference; #IMPLIED>
-<!ATTLIST meta:auto-reload meta:delay %timeDuration; "P0S">
-
-<!ELEMENT meta:hyperlink-behaviour EMPTY>
-<!ATTLIST meta:hyperlink-behaviour office:target-frame-name %targetFrameName; #IMPLIED>
-<!ATTLIST meta:hyperlink-behaviour xlink:show (new|replace) #IMPLIED>
-
-<!ELEMENT dc:language (%cLanguage;)>
-
-<!ELEMENT meta:editing-cycles (%cPositiveInteger;)>
-
-<!ELEMENT meta:editing-duration (%cTimeDuration;)>
-
-<!ELEMENT meta:user-defined (%cString;)>
-<!ATTLIST meta:user-defined meta:name %string; #REQUIRED>
-
-<!ELEMENT meta:document-statistic EMPTY>
-<!ATTLIST meta:document-statistic meta:page-count %positiveInteger; #IMPLIED
- meta:table-count %nonNegativeInteger; #IMPLIED
- meta:draw-count %nonNegativeInteger; #IMPLIED
- meta:image-count %nonNegativeInteger; #IMPLIED
- meta:ole-object-count %nonNegativeInteger; #IMPLIED
- meta:paragraph-count %nonNegativeInteger; #IMPLIED
- meta:word-count %nonNegativeInteger; #IMPLIED
- meta:character-count %nonNegativeInteger; #IMPLIED
- meta:row-count %nonNegativeInteger; #IMPLIED
- meta:cell-count %nonNegativeInteger; #IMPLIED
- meta:object-count %positiveInteger; #IMPLIED>
diff --git a/chart2/workbench/fileformat/newchart.xml_hints b/chart2/workbench/fileformat/newchart.xml_hints
index d964dca781e5..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/newchart.xml_hints
+++ b/chart2/workbench/fileformat/newchart.xml_hints
@@ -1,77 +0,0 @@
-/*
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE office:document-content PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd">
-
- <office:document-content xmlns:office="http://openoffice.org/2000/office"
- xmlns:style="http://openoffice.org/2000/style"
- xmlns:text="http://openoffice.org/2000/text"
- xmlns:table="http://openoffice.org/2000/table"
- xmlns:draw="http://openoffice.org/2000/drawing"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:number="http://openoffice.org/2000/datastyle"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:chart="http://openoffice.org/2000/chart"
- xmlns:dr3d="http://openoffice.org/2000/dr3d"
- xmlns:math="http://www.w3.org/1998/Math/MathML"
- xmlns:form="http://openoffice.org/2000/form"
- xmlns:script="http://openoffice.org/2000/script"
-
- office:class="chart" office:version="1.0">
-
-
-*/
-
-// dtd -----------------------------------------------------
-// <!ELEMENT elementname regel>
-// <!ELEMENT elementname (subelement1,subelement2)> subelemente müssen vorhanden sein und 1 muss vor 2 stehen
-// <!ELEMENT elementname (subelement1|subelement2)> subelement 1 oder 2 muss vorhanden sein
-// <!ELEMENT elementname subelement?+*> ?: einmal oder gar nicht;
- +: mindestens einmal
- *: keinmal oder mehrmals
-// <!ATTLIST zielelement-name
-// attribut-name attribut-datentyp defaultwert>
-//
-// defaultwert: "geeigneter wert"
-// defaultwert: #REQUIRED
-// defaultwert: #IMPLIED (kann weggelassen werden)
-// defaultwert: #FIXED "nicht zu ändernder wert"
-// attribut-datentyp: CDATA
-// attribut-datentyp: enumerated (werte aufzählung z.B.)
-// attribut-datentyp: ENTITY (deklariert in dtd)
-// attribut-datentyp: ENTITIES (mehrfache durch whitespace getrennte ENTITYs)
-// attribut-datentyp: ID (eindeutiges elementkennzeichen)
-// attribut-datentyp: IDREF (wert eines ID-attributes)
-// attribut-datentyp: IDREFS (mehrfache durch whitespace getrennte IDREFs)
-// attribut-datentyp: NMTOKEN (xml-namen-token)
-// attribut-datentyp: NMTOKENS (mehrfache durch whitespace getrennte NMTOKENs)
-// attribut-datentyp: NOTATION (notation deklariert in dtd)
-
-<!----------------style:style----------------------------------- -->
-
-//<!ELEMENT style:style ( style:properties?,office:events?,style:map*)>
-//<!ELEMENT style:properties ANY>
-//<!ATTLIST style:style style:name %styleName; #REQUIRED>
-//<!ENTITY % styleFamily "(paragraph|text|section|
-// table|table-column|table-row|table-cell|table-page|chart|graphics|default|drawing-page|presentation|control|ruby)">
-//<!ATTLIST style:style style:family %styleFamily; #REQUIRED>
-//<!ATTLIST style:style style:parent-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:master-page-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:next-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:list-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:data-style-name %styleName; #IMPLIED>
-//<!ATTLIST style:style style:auto-update %boolean; "false">
-//<!ATTLIST style:style style:class %string; #IMPLIED>
-
-//---------------- expand styleFamily??:
-<!ENTITY % styleFamily "(...|chart|chart-axis||...)">
-
-an chart-axis style 'contains':
-number:number-style (as attribute style:data-style-name="name of a number:number-style")
-
-!!!!!!!!!!!!!! add chart2.mod to office.dtd
-
-!!!!!!!!!!!!!! remove chart from shape entity in dtypes.mod
-than add chart and chart2 to body entity in office.mod
-
-?????????legend-service name as style?? \ No newline at end of file
diff --git a/chart2/workbench/fileformat/newchart_test.xml b/chart2/workbench/fileformat/newchart_test.xml
index a26019d5aee0..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/newchart_test.xml
+++ b/chart2/workbench/fileformat/newchart_test.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE office:document-content PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "office.dtd">
-<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" office:class="chart" office:version="1.0">
- <office:automatic-styles>
- <!-- auto-styles ***************************************************************************************************** -->
- <!-- ******************************************************************************************************************* -->
- </office:automatic-styles>
- <office:body>
- <!-- body ***************************************************************************************************************** -->
- <chart2:chart2>
- <chart2:legend id="legend_0" service="com.sun.star.chart2.Legend"/>
- <chart2:legend id="legend_1" service="com.sun.star.chart2.Legend"/>
- <chart2:scale id="scale1_x" minimum="0" maximum="10">
- <chart2:break start="2" end="3"/>
- </chart2:scale>
- <chart2:scale id="scale1_y" scaling-service="com.sun.star.LogarithmicScaling"/>
- <chart2:increment id="increment1_x" scale="scale1_x">
- <chart2:subincrement count="2"/>
- <chart2:subincrement count="5"/>
- </chart2:increment>
- <chart2:increment id="increment1_y" scale="scale1_y" pre-offset="0" post-equidistant="true" post-distance="1">
- <chart2:subincrement count="10" post-equidistant="false"/>
- </chart2:increment>
- <!-- *************************************** container ***************************************************************-->
- <chart2:final-target id="final_1">
- <chart2:title id="title_1"/>
- <chart2:logic-target id="logic_1">
- <chart2:coordinate-system id="coosys_1" service="com.sun.star.chart2.ThreeDimCartesian" legend="legend_1">
- <chart2:scaleRef scale="scale1_x" direction="reverse"/>
- <chart2:scaleRef scale="scale1_y"/>
- </chart2:coordinate-system>
- </chart2:logic-target>
- </chart2:final-target>
- <!-- *************************************** axes ********************************************************************-->
- <chart2:resident id="axis1_x" service="com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1">
- <chart2:axis dimension="1" increment="increment1_x"/>
- </chart2:resident>
- <chart2:resident id="axis1_y" service="com.sun.star.chart2.CartesianAxis" coordinate-system="coosys_1">
- <chart2:axis dimension="2" increment="increment1_y"/>
- </chart2:resident>
- <!-- *************************************** grids *******************************************************************-->
- <chart2:resident id="grid1_x" service="com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1">
- <chart2:grid dimension="1" increment="increment1_x"/>
- </chart2:resident>
- <chart2:resident id="grid1_y" service="com.sun.star.chart2.CartesianGrid" coordinate-system="coosys_1">
- <chart2:grid dimension="2" increment="increment1_y"/>
- </chart2:resident>
- <!-- *************************************** renderer ***************************************************************-->
- <chart2:resident id="barchart_1" service="com.sun.star.chart2.BarChart" coordinate-system="coosys_1">
- <chart2:renderer/>
- </chart2:resident>
- </chart2:chart2>
- <!-- ************************************************************************************************************************ -->
- </office:body>
-</office:document-content>
diff --git a/chart2/workbench/fileformat/nmspace.mod b/chart2/workbench/fileformat/nmspace.mod
index b3ce73b6c95d..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/nmspace.mod
+++ b/chart2/workbench/fileformat/nmspace.mod
@@ -1,55 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: nmspace.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!ENTITY nFO "http://www.w3.org/1999/XSL/Format">
-<!ENTITY nXLink "http://www.w3.org/1999/xlink">
-<!ENTITY nSVG "http://www.w3.org/2000/svg">
-
-<!-- StarOffice namespace names and prefixes -->
-
-<!ENTITY nOpenOffice "http://openoffice.org/2000">
-<!ENTITY nOpenOffice2001 "http://openoffice.org/2001">
-
-<!ENTITY nOffice "&nOpenOffice;/office">
-<!ENTITY nStyle "&nOpenOffice;/style">
-<!ENTITY nText "&nOpenOffice;/text">
-<!ENTITY nTable "&nOpenOffice;/table">
-<!ENTITY nMeta "&nOpenOffice;/meta">
-<!ENTITY nScript "&nOpenOffice;/script">
-<!ENTITY nDraw "&nOpenOffice;/drawing">
-<!ENTITY nChart "&nOpenOffice;/chart">
-<!ENTITY nChart2 "&nOpenOffice;/chart2">
-<!ENTITY nNumber "&nOpenOffice;/datastyle">
-<!ENTITY nConfig "&nOpenOffice2001;/config">
-
-
-<!-- dublin core namespace name and prefic -->
-<!ENTITY nDC "http://purl.org/dc/elements/1.1/">
diff --git a/chart2/workbench/fileformat/office.dtd b/chart2/workbench/fileformat/office.dtd
index 87546b64abf7..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/office.dtd
+++ b/chart2/workbench/fileformat/office.dtd
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: office.dtd,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-<!ENTITY % dtypes-mod SYSTEM "dtypes.mod">
-%dtypes-mod;
-<!ENTITY % nmspace-mod SYSTEM "nmspace.mod">
-%nmspace-mod;
-<!ENTITY % office-mod SYSTEM "office.mod">
-%office-mod;
-<!ENTITY % style-mod SYSTEM "style.mod">
-%style-mod;
-<!ENTITY % meta-mod SYSTEM "meta.mod">
-%meta-mod;
-<!ENTITY % script-mod SYSTEM "script.mod">
-%script-mod;
-<!ENTITY % drawing-mod SYSTEM "drawing.mod">
-%drawing-mod;
-<!ENTITY % text-mod SYSTEM "text.mod">
-%text-mod;
-<!ENTITY % table-mod SYSTEM "table.mod">
-%table-mod;
-<!ENTITY % chart2-mod SYSTEM "chart2.mod">
-%chart2-mod;
-<!ENTITY % chart-mod SYSTEM "chart.mod">
-%chart-mod;
-<!ENTITY % datastyl-mod SYSTEM "datastyl.mod">
-%datastyl-mod;
-<!ENTITY % form-mod SYSTEM "form.mod">
-%form-mod;
-<!ENTITY % settings-mod SYSTEM "settings.mod">
-%settings-mod;
diff --git a/chart2/workbench/fileformat/office.mod b/chart2/workbench/fileformat/office.mod
index 95e5027fb67a..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/office.mod
+++ b/chart2/workbench/fileformat/office.mod
@@ -1,231 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: office.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!ELEMENT office:document ( office:meta?,
- office:settings?,
- office:script?,
- office:font-decls?,
- office:styles?,
- office:automatic-styles?,
- office:master-styles?,
- office:body ) >
-
-<!ATTLIST office:document xmlns:office CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document xmlns:meta CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document xmlns:script CDATA #FIXED "&nScript;">
-<!ATTLIST office:document xmlns:style CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document xmlns:text CDATA #FIXED "&nText;">
-<!ATTLIST office:document xmlns:table CDATA #FIXED "&nTable;">
-<!ATTLIST office:document xmlns:draw CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document xmlns:chart CDATA #FIXED "&nChart;">
-<!ATTLIST office:document xmlns:number CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document xmlns:fo CDATA #FIXED "&nFO;">
-<!ATTLIST office:document xmlns:xlink CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document xmlns:svg CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document xmlns:dc CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document office:class
- (text|text-global|
- drawing|presentation|
- spreadsheet|chart) #REQUIRED>
-
-<!ATTLIST office:document office:version %string; #IMPLIED>
-
-<!-- document-styles -->
-<!ELEMENT office:document-styles (
- office:font-decls?,
- office:styles?,
- office:automatic-styles?,
- office:master-styles? ) >
-
-<!ATTLIST office:document-styles xmlns:office CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-styles xmlns:meta CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document-styles xmlns:script CDATA #FIXED "&nScript;">
-<!ATTLIST office:document-styles xmlns:style CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document-styles xmlns:text CDATA #FIXED "&nText;">
-<!ATTLIST office:document-styles xmlns:table CDATA #FIXED "&nTable;">
-<!ATTLIST office:document-styles xmlns:draw CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document-styles xmlns:chart CDATA #FIXED "&nChart;">
-<!ATTLIST office:document-styles xmlns:number CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document-styles xmlns:fo CDATA #FIXED "&nFO;">
-<!ATTLIST office:document-styles xmlns:xlink CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-styles xmlns:svg CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document-styles xmlns:dc CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document-styles office:version %string; #IMPLIED>
-
-<!-- document-content -->
-
-<!ELEMENT office:document-content (
- office:script?,
- office:font-decls?,
- office:automatic-styles?,
- office:body ) >
-
-<!ATTLIST office:document-content xmlns:office CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-content xmlns:meta CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document-content xmlns:script CDATA #FIXED "&nScript;">
-<!ATTLIST office:document-content xmlns:style CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document-content xmlns:text CDATA #FIXED "&nText;">
-<!ATTLIST office:document-content xmlns:table CDATA #FIXED "&nTable;">
-<!ATTLIST office:document-content xmlns:draw CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document-content xmlns:chart CDATA #FIXED "&nChart;">
-<!ATTLIST office:document-content xmlns:number CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document-content xmlns:fo CDATA #FIXED "&nFO;">
-<!ATTLIST office:document-content xmlns:xlink CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-content xmlns:svg CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document-content xmlns:dc CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document-content office:class
- (text|text-global|
- drawing|presentation|
- spreadsheet|chart) #REQUIRED>
-
-<!ATTLIST office:document-content office:version %string; #IMPLIED>
-
-<!-- document-content -->
-
-<!ELEMENT office:document-meta ( office:meta? ) >
-
-<!ATTLIST office:document-meta xmlns:office CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-meta xmlns:meta CDATA #FIXED "&nMeta;">
-<!ATTLIST office:document-meta xmlns:script CDATA #FIXED "&nScript;">
-<!ATTLIST office:document-meta xmlns:style CDATA #FIXED "&nStyle;">
-<!ATTLIST office:document-meta xmlns:text CDATA #FIXED "&nText;">
-<!ATTLIST office:document-meta xmlns:table CDATA #FIXED "&nTable;">
-<!ATTLIST office:document-meta xmlns:draw CDATA #FIXED "&nDraw;">
-<!ATTLIST office:document-meta xmlns:chart CDATA #FIXED "&nChart;">
-<!ATTLIST office:document-meta xmlns:number CDATA #FIXED "&nNumber;">
-<!ATTLIST office:document-meta xmlns:fo CDATA #FIXED "&nFO;">
-<!ATTLIST office:document-meta xmlns:xlink CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-meta xmlns:svg CDATA #FIXED "&nSVG;">
-<!ATTLIST office:document-meta xmlns:dc CDATA #FIXED "&nDC;">
-
-<!ATTLIST office:document-meta office:version %string; #IMPLIED>
-
-<!ELEMENT office:document-settings (office:settings) >
-<!ATTLIST office:document-settings xmlns:office CDATA #FIXED "&nOffice;">
-<!ATTLIST office:document-settings xmlns:xlink CDATA #FIXED "&nXLink;">
-<!ATTLIST office:document-settings xmlns:config CDATA #FIXED "&nConfig;">
-
-<!ATTLIST office:document-settings office:version %string; #IMPLIED>
-
-<!ENTITY % meta "(meta:generator?,
- dc:title?,
- dc:description?,
- dc:subject?,
- meta:initial-creator?,
- meta:creation-date?,
- dc:creator?,
- dc:date?,
- meta:printed-by?,
- meta:print-date?,
- meta:keywords?,
- dc:language?,
- meta:editing-cycles?,
- meta:editing-duration?,
- meta:hyperlink-behaviour?,
- meta:auto-reload?,
- meta:template?,
- meta:user-defined*,
- meta:document-statistic?)">
-<!ELEMENT office:meta %meta;>
-
-<!ENTITY % script "(script:library-embedded |
- script:library-linked)*,office:events?">
-<!ELEMENT office:script (%script;)>
-
-<!ELEMENT office:font-decls (style:font-decl)*>
-
-<!ENTITY % styles "(style:default-style|style:style|text:list-style|
- number:number-style|number:currency-style|number:percentage-style|
- number:date-style|number:time-style|number:boolean-style|
- number:text-style|
- draw:gradient|draw:hatch|draw:fill-image|draw:marker|draw:stroke-dash|
- style:presentation-page-layout|draw:transparency)">
-
-<!-- Validity constraint: The elements
- text:outline-style,
- text:footnotes-configuration,
- text:endnotes-configuration,
- text:bibliography-configuration and
- text:linenumbering-configuration
- may appear only once!
- Unfortunatetly, this constraint cannot be easily specified in the DTD.
--->
-<!ELEMENT office:styles (%styles;|text:outline-style|
- text:footnotes-configuration|text:endnotes-configuration|
- text:bibliography-configuration|text:linenumbering-configuration)*>
-
-<!ELEMENT office:automatic-styles (%styles;|style:page-master)*>
-
-<!ELEMENT office:master-styles (draw:layer-set?,style:handout-master?,style:master-page*) >
-
-<!ENTITY % text-decls "text:variable-decls?, text:sequence-decls?,
- text:user-field-decls?, text:dde-connection-decls?,
- text:alphabetical-index-auto-mark-file?" >
-<!ENTITY % change-marks "text:change | text:change-start | text:change-end">
-<!ENTITY % body "(office:forms?,(text:tracked-changes|table:tracked-changes)?,%text-decls;,table:calculation-settings?,table:content-validations?,table:label-ranges?,
- (text:h|text:p|text:ordered-list|
- text:unordered-list|table:table|draw:page|
- draw:a|%shape;|chart:chart|chart2:chart2|text:section|text:table-of-content|
- text:illustration-index|text:table-index|text:object-index|
- text:user-index|text:alphabetical-index|text:bibliography|
- %change-marks;)*,
- table:named-expressions?,
- table:database-ranges?,table:data-pilot-tables?,
- table:consolidation?,
- table:dde-links?,
- presentation:settings?)">
-<!ELEMENT office:body %body;>
-<!ATTLIST office:body table:structure-protected %boolean; "false"
- table:protection-key CDATA #IMPLIED>
-<!ELEMENT office:events (script:event|presentation:event)*>
-<!-- DDE source: for text sections and tables -->
-<!ELEMENT office:dde-source EMPTY>
-<!ATTLIST office:dde-source office:dde-application CDATA #IMPLIED>
-<!ATTLIST office:dde-source office:dde-topic CDATA #IMPLIED>
-<!ATTLIST office:dde-source office:dde-item CDATA #IMPLIED>
-<!ATTLIST office:dde-source office:automatic-update %boolean; "false">
-<!ATTLIST office:dde-source office:name CDATA #IMPLIED>
-<!ATTLIST office:dde-source table:conversion-mode (into-default-style-data-style|into-english-number|let-text) "into-default-style-data-style" >
-<!-- annotations -->
-<!-- limitation: in the current implementation, only plain text inside of
- paragraphs is supported -->
-<!ELEMENT office:annotation (text:p)*>
-<!ATTLIST office:annotation office:author %string; #IMPLIED>
-<!ATTLIST office:annotation office:create-date %date; #IMPLIED>
-<!ATTLIST office:annotation office:create-date-string %string; #IMPLIED>
-<!ATTLIST office:annotation office:display %boolean; "false">
-<!ELEMENT office:change-info (text:p)*>
-<!ATTLIST office:change-info office:chg-author %string; #REQUIRED>
-<!ATTLIST office:change-info office:chg-date-time %timeInstance; #REQUIRED>
-<!ELEMENT office:binary-data (#PCDATA)>
diff --git a/chart2/workbench/fileformat/script.mod b/chart2/workbench/fileformat/script.mod
index 81220e346f20..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/script.mod
+++ b/chart2/workbench/fileformat/script.mod
@@ -1,55 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: script.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!ELEMENT script:library-embedded (script:module*)>
-<!ATTLIST script:library-embedded script:name %string; #REQUIRED>
-<!ATTLIST script:library-embedded script:password %string; #IMPLIED>
-
-<!ELEMENT script:library-linked EMPTY>
-<!ATTLIST script:library-linked script:name %string; #REQUIRED>
-<!ATTLIST script:library-linked xlink:href %string; #REQUIRED>
-<!ATTLIST script:library-linked xlink:type (simple) #FIXED "simple">
-
-<!ELEMENT script:module (#PCDATA)>
-<!ATTLIST script:module script:name %string; #REQUIRED>
-<!ATTLIST script:module script:language %string; #IMPLIED>
-
-
-<!ENTITY % script-language "script:language %string; #REQUIRED">
-<!ENTITY % event-name "script:event-name %string; #REQUIRED">
-<!ENTITY % location "script:location (document|application) #REQUIRED">
-<!ENTITY % macro-name "script:macro-name %string; #REQUIRED">
-
-<!ELEMENT script:event (#PCDATA)>
-<!ATTLIST script:event %script-language;
- %event-name;
- %location;
- %macro-name;>
diff --git a/chart2/workbench/fileformat/settings.mod b/chart2/workbench/fileformat/settings.mod
index 5ba8f38f3ba6..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/settings.mod
+++ b/chart2/workbench/fileformat/settings.mod
@@ -1,53 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: settings.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!ELEMENT office:settings (config:config-item-set+)>
-
-<!ENTITY % items "(config:config-item |
- config:config-item-set |
- config:config-item-map-named |
- config:config-item-map-indexed)+">
-
-<!ELEMENT config:config-item-set %items;>
-<!ATTLIST config:config-item-set config:name CDATA #REQUIRED>
-
-<!ELEMENT config:config-item (#PCDATA)>
-<!ATTLIST config:config-item config:name CDATA #REQUIRED
- config:type (boolean | short | int | long | double | string | datetime | base64Binary) #REQUIRED>
-
-<!ELEMENT config:config-item-map-named (config:config-item-map-entry)+>
-<!ATTLIST config:config-item-map-named config:name CDATA #REQUIRED>
-
-<!ELEMENT config:config-item-map-indexed (config:config-item-map-entry)+>
-<!ATTLIST config:config-item-map-indexed config:name CDATA #REQUIRED>
-
-<!ELEMENT config:config-item-map-entry %items;>
-<!ATTLIST config:config-item-map-entry config:name CDATA #IMPLIED>
diff --git a/chart2/workbench/fileformat/style.mod b/chart2/workbench/fileformat/style.mod
index d167a25b60a8..e69de29bb2d1 100644
--- a/chart2/workbench/fileformat/style.mod
+++ b/chart2/workbench/fileformat/style.mod
@@ -1,412 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2008 by Sun Microsystems, Inc.
-
- OpenOffice.org - a multi-platform office productivity suite
-
- $RCSfile: style.mod,v $
-
- $Revision: 1.3 $
-
- This file is part of OpenOffice.org.
-
- OpenOffice.org is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3
- only, as published by the Free Software Foundation.
-
- OpenOffice.org is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License version 3 for more details
- (a copy is included in the LICENSE file that accompanied this code).
-
- You should have received a copy of the GNU Lesser General Public License
- version 3 along with OpenOffice.org. If not, see
- <http://www.openoffice.org/license.html>
- for a copy of the LGPLv3 License.
-
--->
-
-<!ELEMENT style:font-decl EMPTY>
-<!ATTLIST style:font-decl style:name %string; #REQUIRED>
-<!ATTLIST style:font-decl fo:font-family %string; #REQUIRED>
-<!ATTLIST style:font-decl style:font-style-name %string; #IMPLIED>
-<!ENTITY % fontFamilyGeneric "(roman|swiss|modern|decorative|script|system)">
-<!ATTLIST style:font-decl style:font-family-generic %fontFamilyGeneric;
- #IMPLIED>
-<!ENTITY % fontPitch "(fixed|variable)">
-<!ATTLIST style:font-decl style:font-pitch %fontPitch; #IMPLIED>
-<!ATTLIST style:font-decl style:font-charset %textEncoding; #IMPLIED>
-
-<!ELEMENT style:style ( style:properties?,office:events?,style:map*)>
-
-<!ATTLIST style:style style:name %styleName; #REQUIRED>
-
-<!ENTITY % styleFamily "(paragraph|text|section|
- table|table-column|table-row|table-cell|table-page|chart|graphics|default|drawing-page|presentation|control|ruby)">
-<!ATTLIST style:style style:family %styleFamily; #REQUIRED>
-
-<!ATTLIST style:style style:parent-style-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:master-page-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:next-style-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:list-style-name %styleName; #IMPLIED>
-<!ATTLIST style:style style:data-style-name %styleName; #IMPLIED>
-
-<!ATTLIST style:style style:auto-update %boolean; "false">
-
-<!ATTLIST style:style style:class %string; #IMPLIED>
-
-<!ELEMENT style:default-style (style:properties?)>
-<!ATTLIST style:default-style style:family %styleFamily; #REQUIRED>
-
-<!ELEMENT style:map EMPTY>
-
-<!ATTLIST style:map style:condition %string; #REQUIRED>
-<!ATTLIST style:map style:apply-style-name %styleName; #REQUIRED>
-<!ATTLIST style:map style:base-cell-address %cell-address; #IMPLIED>
-
-<!ELEMENT style:properties ANY>
-
-<!-- number format properties -->
-<!ATTLIST style:properties style:num-prefix %string; #IMPLIED>
-<!ATTLIST style:properties style:num-suffix %string; #IMPLIED>
-<!ATTLIST style:properties style:num-format %string; #IMPLIED>
-<!ATTLIST style:properties style:num-letter-sync %boolean; #IMPLIED>
-
-<!-- frame properties -->
-<!ATTLIST style:properties fo:width %positiveLength; #IMPLIED>
-<!ATTLIST style:properties fo:height %positiveLength; #IMPLIED>
-<!ATTLIST style:properties style:vertical-pos (top|middle|bottom|from-top|below) #IMPLIED>
-<!ATTLIST style:properties style:vertical-rel (page|page-content|
- frame|frame-content|
- paragraph|paragraph-content|char|
- line|baseline|text) #IMPLIED>
-<!ATTLIST style:properties style:horizontal-pos (left|center|right|from-left|inside|outside|from-inside) #IMPLIED>
-<!ATTLIST style:properties style:horizontal-rel (page|page-content|
- page-start-margin|page-end-margin|
- frame|frame-content|
- frame-start-margin|frame-end-margin|
- paragraph|paragraph-content|
- paragraph-start-margin|paragraph-end-margin|
- char) #IMPLIED>
-<!ATTLIST style:properties svg:width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties svg:height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:min-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:min-width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:max-height %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:max-width %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties text:anchor-type %anchorType; #IMPLIED>
-<!ATTLIST style:properties text:anchor-page-number %positiveInteger; #IMPLIED>
-<!ATTLIST style:properties svg:x %coordinate; #IMPLIED>
-<!ATTLIST style:properties svg:y %coordinate; #IMPLIED>
-<!ATTLIST style:properties style:print-content %boolean; #IMPLIED>
-<!ATTLIST style:properties style:protect %boolean; #IMPLIED>
-<!ATTLIST style:properties style:wrap (none|left|right|parallel|dynamic|run-through) #IMPLIED>
-<!ENTITY % noLimitOrPositiveInteger "CDATA">
-<!ATTLIST style:properties style:number-wrapped-paragraphs %noLimitOrPositiveInteger; #IMPLIED>
-<!ATTLIST style:properties style:wrap-contour %boolean; #IMPLIED>
-<!ATTLIST style:properties style:wrap-contour-mode (full|outside) #IMPLIED>
-<!ATTLIST style:properties style:run-through (foreground|background) #IMPLIED>
-<!ATTLIST style:properties style:editable %boolean; #IMPLIED>
-<!ATTLIST style:properties style:mirror CDATA #IMPLIED>
-<!ATTLIST style:properties fo:clip CDATA #IMPLIED>
-<!ATTLIST style:properties text:animation (none|scroll|alternate|slide) #IMPLIED>
-<!ATTLIST style:properties text:animation-direction (left|right|up|down) #IMPLIED>
-<!ATTLIST style:properties text:animation-start-inside %boolean; #IMPLIED>
-<!ATTLIST style:properties text:animation-stop-inside %boolean; #IMPLIED>
-<!ATTLIST style:properties text:animation-repeat %integer; #IMPLIED>
-<!ATTLIST style:properties text:animation-delay %timeDuration; #IMPLIED>
-<!ATTLIST style:properties text:animation-steps %length; #IMPLIED>
-
-<!-- text properties -->
-<!ATTLIST style:properties fo:font-variant (normal|small-caps) #IMPLIED>
-<!ATTLIST style:properties fo:text-transform (none|lowercase|
- uppercase|capitalize) #IMPLIED>
-<!ATTLIST style:properties fo:color %color; #IMPLIED>
-<!ATTLIST style:properties style:use-window-font-color %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-outline %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-crossing-out
- (none|single-line|double-line|thick-line|slash|X)
- #IMPLIED>
-<!ATTLIST style:properties style:text-position CDATA #IMPLIED>
-<!ATTLIST style:properties style:text-align (left|right|start|center|end|justify|justified) #IMPLIED>
-
-<!ATTLIST style:properties style:font-name %string; #IMPLIED>
-<!ATTLIST style:properties fo:font-family %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-generic %fontFamilyGeneric;
- #IMPLIED>
-<!ATTLIST style:properties style:font-style-name %string; #IMPLIED>
-<!ATTLIST style:properties style:font-pitch %fontPitch; #IMPLIED>
-<!ATTLIST style:properties style:font-charset %textEncoding; #IMPLIED>
-<!ATTLIST style:properties style:font-name-asian %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-asian %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-generic-asian %fontFamilyGeneric;
- #IMPLIED>
-<!ATTLIST style:properties style:font-style-name-asian %string; #IMPLIED>
-<!ATTLIST style:properties style:font-pitch-asian %fontPitch; #IMPLIED>
-<!ATTLIST style:properties style:font-charset-asian %textEncoding; #IMPLIED>
-<!ATTLIST style:properties style:font-name-complex %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-complex %string; #IMPLIED>
-<!ATTLIST style:properties style:font-family-generic-complex %fontFamilyGeneric;
- #IMPLIED>
-<!ATTLIST style:properties style:font-style-name-complex %string; #IMPLIED>
-<!ATTLIST style:properties style:font-pitch-complex %fontPitch; #IMPLIED>
-<!ATTLIST style:properties style:font-charset-complex %textEncoding; #IMPLIED>
-
-<!ATTLIST style:properties fo:font-size %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:font-size-rel %length; #IMPLIED>
-<!ATTLIST style:properties style:font-size-asian %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:font-size-rel-asian %length; #IMPLIED>
-<!ATTLIST style:properties style:font-size-complex %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:font-size-rel-complex %length; #IMPLIED>
-<!ENTITY % normalOrLength "CDATA">
-<!ATTLIST style:properties fo:letter-spacing %normalOrLength; #IMPLIED>
-<!ATTLIST style:properties fo:language %languageOnly; #IMPLIED>
-<!ATTLIST style:properties style:language-asian %languageOnly; #IMPLIED>
-<!ATTLIST style:properties style:language-complex %languageOnly; #IMPLIED>
-<!ATTLIST style:properties fo:country %country; #IMPLIED>
-<!ATTLIST style:properties style:country-asian %country; #IMPLIED>
-<!ATTLIST style:properties style:country-complex %country; #IMPLIED>
-<!ENTITY % fontStyle "(normal|italic|oblique)">
-<!ATTLIST style:properties fo:font-style %fontStyle; #IMPLIED>
-<!ATTLIST style:properties style:font-style-asian %fontStyle; #IMPLIED>
-<!ATTLIST style:properties style:font-style-complex %fontStyle; #IMPLIED>
-<!ENTITY % fontRelief "(none|embossed|engraved)">
-<!ATTLIST style:properties style:font-relief %fontRelief; #IMPLIED>
-<!ATTLIST style:properties fo:text-shadow CDATA #IMPLIED>
-<!ATTLIST style:properties style:text-underline
- (none|single|double|dotted|dash|long-dash|dot-dash|
- dot-dot-dash|wave|bold|bold-dotted|bold-dash|
- bold-long-dash|bold-dot-dash|bold-dot-dot-dash|
- bold-wave|double-wave|small-wave) #IMPLIED>
-<!ATTLIST style:properties style:text-autospace (none | ideograph-alpha) #IMPLIED>
-<!ATTLIST style:properties style:punctuation-wrap (simple | hanging) #IMPLIED>
-<!ATTLIST style:properties style:line-break (normal | strict) #IMPLIED>
-<!ENTITY % fontColorOrColor "CDATA">
-<!ATTLIST style:properties style:text-underline-color %fontColorOrColor;
- #IMPLIED>
-<!ATTLIST style:properties fo:font-weight CDATA #IMPLIED>
-<!ATTLIST style:properties style:font-weight-asian CDATA #IMPLIED>
-<!ATTLIST style:properties style:font-weight-complex CDATA #IMPLIED>
-<!ATTLIST style:properties fo:score-spaces %boolean; #IMPLIED>
-<!ATTLIST style:properties style:letter-kerning %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-blinking %boolean; #IMPLIED>
-<!ATTLIST style:properties style:text-background-color %transparentOrColor;
- #IMPLIED>
-
-<!ATTLIST style:properties style:text-combine (none|letters|lines) #IMPLIED>
-<!ATTLIST style:properties style:text-combine-start-char %character; #IMPLIED>
-<!ATTLIST style:properties style:text-combine-end-char %character; #IMPLIED>
-<!ATTLIST style:properties style:text-emphasize CDATA #IMPLIED>
-<!ATTLIST style:properties style:text-scale %percentage; #IMPLIED>
-<!ATTLIST style:properties style:text-rotation-angle %integer; #IMPLIED>
-<!ATTLIST style:properties style:text-rotation-scale (fixed|line-height) #IMPLIED>
-
-<!-- paragraph properties -->
-<!ENTITY % nonNegativeLengthOrPercentageOrNormal "CDATA">
-<!ATTLIST style:properties fo:line-height
- %nonNegativeLengthOrPercentageOrNormal; #IMPLIED>
-<!ATTLIST style:properties style:line-height-at-least %nonNegativeLength;
- #IMPLIED>
-<!ATTLIST style:properties style:line-spacing %length; #IMPLIED>
-<!ATTLIST style:properties fo:text-align (start|end|center|justify) #IMPLIED>
-<!ATTLIST style:properties fo:text-align-last (start|center|justify) #IMPLIED>
-<!ATTLIST style:properties style:text-align-source (fix|value-type) #IMPLIED>
-<!ATTLIST style:properties style:justify-single-word %boolean; #IMPLIED>
-<!ATTLIST style:properties style:break-inside (auto|avoid) #IMPLIED>
-<!ATTLIST style:properties fo:widows %nonNegativeInteger; #IMPLIED>
-<!ATTLIST style:properties fo:orphans %nonNegativeInteger; #IMPLIED>
-
-<!ATTLIST style:properties fo:hyphenate %boolean; #IMPLIED>
-<!ATTLIST style:properties fo:hyphenate-keep (none|page) #IMPLIED>
-<!ATTLIST style:properties fo:hyphenation-remain-char-count %positiveInteger;
- #IMPLIED>
-<!ATTLIST style:properties fo:hyphenation-push-char-count %positiveInteger;
- #IMPLIED>
-<!ATTLIST style:properties fo:hyphenation-ladder-count
- %noLimitOrPositiveInteger; #IMPLIED>
-<!ATTLIST style:properties style:page-number %positiveInteger; #IMPLIED>
-
-<!ELEMENT style:tab-stops (style:tab-stop)*>
-<!ELEMENT style:tab-stop EMPTY>
-<!ATTLIST style:tab-stop style:position %nonNegativeLength; #REQUIRED>
-<!ATTLIST style:tab-stop style:type (left|center|right|char|default) "left">
-<!ATTLIST style:tab-stop style:char %character; #IMPLIED>
-<!ATTLIST style:tab-stop style:leader-char %character; " ">
-
-<!ELEMENT style:drop-cap EMPTY>
-<!ENTITY % wordOrPositiveInteger "CDATA">
-<!ATTLIST style:drop-cap style:length %wordOrPositiveInteger; "1">
-<!ATTLIST style:drop-cap style:lines %positiveInteger; "1">
-<!ATTLIST style:drop-cap style:distance %length; "0cm">
-<!ATTLIST style:drop-cap style:style-name %styleName; #IMPLIED>
-
-<!ATTLIST style:properties style:register-true %boolean; #IMPLIED>
-<!ATTLIST style:properties style:register-truth-ref-style-name %styleName; #IMPLIED>
-<!ATTLIST style:properties fo:margin-left %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:margin-right %positiveLengthOrPercentage;
- #IMPLIED>
-<!ATTLIST style:properties fo:text-indent %lengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties style:auto-text-indent %boolean; #IMPLIED>
-<!ATTLIST style:properties fo:margin-top %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:margin-bottom %positiveLengthOrPercentage; #IMPLIED>
-<!ATTLIST style:properties fo:break-before (auto|column|page) #IMPLIED>
-<!ATTLIST style:properties fo:break-after (auto|column|page) #IMPLIED>
-<!ATTLIST style:properties fo:background-color %transparentOrColor; #IMPLIED>
-
-<!ELEMENT style:background-image (office:binary-data?)>
-<!ATTLIST style:background-image xlink:type (simple) #IMPLIED>
-<!ATTLIST style:background-image xlink:href