summaryrefslogtreecommitdiff
path: root/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx')
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx225
1 files changed, 90 insertions, 135 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index d90aaa73f32c..95d20ccf654d 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -145,306 +145,261 @@ enum
void lcl_AddPropertiesToVector(
std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "AttributedDataPoints",
+ rOutProperties.emplace_back( "AttributedDataPoints",
PROP_DIAGRAM_ATTRIBUTED_DATA_POINTS,
cppu::UnoType<uno::Sequence< uno::Sequence< sal_Int32 > >>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
// see com.sun.star.chart.StackableDiagram
- rOutProperties.push_back(
- Property( "Percent",
+ rOutProperties.emplace_back( "Percent",
PROP_DIAGRAM_PERCENT_STACKED,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "Stacked",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "Stacked",
PROP_DIAGRAM_STACKED,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "Dim3D",
+ rOutProperties.emplace_back( "Dim3D",
PROP_DIAGRAM_THREE_D,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// see com.sun.star.chart.Chart3DBarProperties
- rOutProperties.push_back(
- Property( "SolidType",
+ rOutProperties.emplace_back( "SolidType",
PROP_DIAGRAM_SOLIDTYPE,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// see com.sun.star.chart.BarDiagram
- rOutProperties.push_back(
- Property( "Deep",
+ rOutProperties.emplace_back( "Deep",
PROP_DIAGRAM_DEEP,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "Vertical",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "Vertical",
PROP_DIAGRAM_VERTICAL,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "NumberOfLines",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "NumberOfLines",
PROP_DIAGRAM_NUMBER_OF_LINES,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "StackedBarsConnected",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "StackedBarsConnected",
PROP_DIAGRAM_STACKED_BARS_CONNECTED,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "DataRowSource",
+ rOutProperties.emplace_back( "DataRowSource",
PROP_DIAGRAM_DATAROW_SOURCE,
cppu::UnoType<css::chart::ChartDataRowSource>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "GroupBarsPerAxis",
+ rOutProperties.emplace_back( "GroupBarsPerAxis",
PROP_DIAGRAM_GROUP_BARS_PER_AXIS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "IncludeHiddenCells",
+ rOutProperties.emplace_back( "IncludeHiddenCells",
PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
//new for XY charts
- rOutProperties.push_back(
- Property( CHART_UNONAME_SORT_BY_XVALUES,
+ rOutProperties.emplace_back( CHART_UNONAME_SORT_BY_XVALUES,
PROP_DIAGRAM_SORT_BY_X_VALUES,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
//for pie and donut charts
- rOutProperties.push_back(
- Property( "StartingAngle",
+ rOutProperties.emplace_back( "StartingAngle",
PROP_DIAGRAM_STARTING_ANGLE,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
//new for 3D charts
- rOutProperties.push_back(
- Property( "RightAngledAxes",
+ rOutProperties.emplace_back( "RightAngledAxes",
PROP_DIAGRAM_RIGHT_ANGLED_AXES,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "Perspective",
+ rOutProperties.emplace_back( "Perspective",
PROP_DIAGRAM_PERSPECTIVE,
cppu::UnoType<sal_Int32>::get(),
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "RotationHorizontal",
+ rOutProperties.emplace_back( "RotationHorizontal",
PROP_DIAGRAM_ROTATION_HORIZONTAL,
cppu::UnoType<sal_Int32>::get(),
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "RotationVertical",
+ rOutProperties.emplace_back( "RotationVertical",
PROP_DIAGRAM_ROTATION_VERTICAL,
cppu::UnoType<sal_Int32>::get(),
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
// XAxisXSupplier
- rOutProperties.push_back(
- Property( "HasXAxis",
+ rOutProperties.emplace_back( "HasXAxis",
PROP_DIAGRAM_HAS_X_AXIS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasXAxisDescription",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasXAxisDescription",
PROP_DIAGRAM_HAS_X_AXIS_DESCR,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasXAxisTitle",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasXAxisTitle",
PROP_DIAGRAM_HAS_X_AXIS_TITLE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasXAxisGrid",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasXAxisGrid",
PROP_DIAGRAM_HAS_X_AXIS_GRID,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasXAxisHelpGrid",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasXAxisHelpGrid",
PROP_DIAGRAM_HAS_X_AXIS_HELP_GRID,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// XAxisYSupplier
- rOutProperties.push_back(
- Property( "HasYAxis",
+ rOutProperties.emplace_back( "HasYAxis",
PROP_DIAGRAM_HAS_Y_AXIS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasYAxisDescription",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasYAxisDescription",
PROP_DIAGRAM_HAS_Y_AXIS_DESCR,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasYAxisTitle",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasYAxisTitle",
PROP_DIAGRAM_HAS_Y_AXIS_TITLE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasYAxisGrid",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasYAxisGrid",
PROP_DIAGRAM_HAS_Y_AXIS_GRID,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasYAxisHelpGrid",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasYAxisHelpGrid",
PROP_DIAGRAM_HAS_Y_AXIS_HELP_GRID,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// XAxisZSupplier
- rOutProperties.push_back(
- Property( "HasZAxis",
+ rOutProperties.emplace_back( "HasZAxis",
PROP_DIAGRAM_HAS_Z_AXIS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasZAxisDescription",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasZAxisDescription",
PROP_DIAGRAM_HAS_Z_AXIS_DESCR,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasZAxisTitle",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasZAxisTitle",
PROP_DIAGRAM_HAS_Z_AXIS_TITLE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasZAxisGrid",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasZAxisGrid",
PROP_DIAGRAM_HAS_Z_AXIS_GRID,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasZAxisHelpGrid",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasZAxisHelpGrid",
PROP_DIAGRAM_HAS_Z_AXIS_HELP_GRID,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// XTwoAxisXSupplier
- rOutProperties.push_back(
- Property( "HasSecondaryXAxis",
+ rOutProperties.emplace_back( "HasSecondaryXAxis",
PROP_DIAGRAM_HAS_SECOND_X_AXIS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasSecondaryXAxisDescription",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasSecondaryXAxisDescription",
PROP_DIAGRAM_HAS_SECOND_X_AXIS_DESCR,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// XTwoAxisYSupplier
- rOutProperties.push_back(
- Property( "HasSecondaryYAxis",
+ rOutProperties.emplace_back( "HasSecondaryYAxis",
PROP_DIAGRAM_HAS_SECOND_Y_AXIS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasSecondaryYAxisDescription",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasSecondaryYAxisDescription",
PROP_DIAGRAM_HAS_SECOND_Y_AXIS_DESCR,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// XSecondAxisTitleSupplier
- rOutProperties.push_back(
- Property( "HasSecondaryXAxisTitle",
+ rOutProperties.emplace_back( "HasSecondaryXAxisTitle",
PROP_DIAGRAM_HAS_SECOND_X_AXIS_TITLE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasSecondaryYAxisTitle",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasSecondaryYAxisTitle",
PROP_DIAGRAM_HAS_SECOND_Y_AXIS_TITLE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "MissingValueTreatment",
+ rOutProperties.emplace_back( "MissingValueTreatment",
PROP_DIAGRAM_MISSING_VALUE_TREATMENT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "AutomaticSize",
+ rOutProperties.emplace_back( "AutomaticSize",
PROP_DIAGRAM_AUTOMATIC_SIZE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "DataTableHBorder",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "DataTableHBorder",
PROP_DIAGRAM_DATATABLEHBORDER,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "DataTableVBorder",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "DataTableVBorder",
PROP_DIAGRAM_DATATABLEVBORDER,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "DataTableOutline",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "DataTableOutline",
PROP_DIAGRAM_DATATABLEOUTLINE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ExternalData",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ExternalData",
PROP_DIAGRAM_EXTERNALDATA,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
}
struct StaticDiagramWrapperPropertyArray_Initializer