[Libreoffice-commits] core.git: canvas/source chart2/qa chart2/source codemaker/source comphelper/source configmgr/source cppcanvas/source cui/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Sep 11 06:41:22 UTC 2017
canvas/source/cairo/cairo_textlayout.cxx | 4
canvas/source/factory/cf_service.cxx | 18
canvas/source/tools/spriteredrawmanager.cxx | 14
chart2/qa/unit/common_functor_test.cxx | 14
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 180 ++----
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 60 --
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 75 +-
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 225 +++----
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 10
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 15
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx | 5
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 5
chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx | 5
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 15
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 70 --
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 10
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 20
chart2/source/controller/dialogs/DataBrowserModel.cxx | 14
chart2/source/controller/main/ChartDropTargetHelper.cxx | 2
chart2/source/controller/main/CommandDispatchContainer.cxx | 4
chart2/source/controller/main/ObjectHierarchy.cxx | 52 -
chart2/source/model/main/Axis.cxx | 95 +--
chart2/source/model/main/BaseCoordinateSystem.cxx | 5
chart2/source/model/main/ChartModel_Persistence.cxx | 2
chart2/source/model/main/DataPointProperties.cxx | 285 ++++------
chart2/source/model/main/DataSeriesProperties.cxx | 20
chart2/source/model/main/Diagram.cxx | 90 +--
chart2/source/model/main/GridProperties.cxx | 5
chart2/source/model/main/Legend.cxx | 30 -
chart2/source/model/main/Title.cxx | 60 --
chart2/source/model/template/AreaChartTypeTemplate.cxx | 5
chart2/source/model/template/BarChartTypeTemplate.cxx | 10
chart2/source/model/template/CandleStickChartType.cxx | 41 -
chart2/source/model/template/ColumnChartType.cxx | 10
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 5
chart2/source/model/template/LineChartType.cxx | 15
chart2/source/model/template/LineChartTypeTemplate.cxx | 15
chart2/source/model/template/PieChartType.cxx | 10
chart2/source/model/template/PieChartTypeTemplate.cxx | 20
chart2/source/model/template/ScatterChartType.cxx | 15
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 15
chart2/source/model/template/StockChartTypeTemplate.cxx | 20
chart2/source/tools/CharacterProperties.cxx | 230 +++-----
chart2/source/tools/ExplicitCategoriesProvider.cxx | 6
chart2/source/tools/FillProperties.cxx | 90 +--
chart2/source/tools/LinePropertiesHelper.cxx | 35 -
chart2/source/tools/ModifyListenerHelper.cxx | 2
chart2/source/tools/RangeHighlighter.cxx | 10
chart2/source/tools/RegressionCurveModel.cxx | 35 -
chart2/source/tools/RegressionEquation.cxx | 35 -
chart2/source/tools/RelativeSizeHelper.cxx | 6
chart2/source/tools/SceneProperties.cxx | 165 ++---
chart2/source/tools/UserDefinedProperties.cxx | 20
chart2/source/view/charttypes/VSeriesPlotter.cxx | 4
chart2/source/view/main/GL3DRenderer.cxx | 24
codemaker/source/cppumaker/cppuoptions.cxx | 4
codemaker/source/javamaker/javaoptions.cxx | 4
codemaker/source/javamaker/javatype.cxx | 17
comphelper/source/container/interfacecontainer2.cxx | 2
comphelper/source/misc/asyncnotification.cxx | 2
comphelper/source/misc/backupfilehelper.cxx | 26
comphelper/source/misc/configurationhelper.cxx | 4
comphelper/source/misc/profilezone.cxx | 3
comphelper/source/misc/servicedecl.cxx | 4
comphelper/source/misc/syntaxhighlight.cxx | 5
comphelper/source/xml/attributelist.cxx | 2
configmgr/source/access.cxx | 38 -
configmgr/source/broadcaster.cxx | 19
configmgr/source/components.cxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 25
cppcanvas/source/mtfrenderer/implrenderer.cxx | 115 +---
cui/source/customize/macropg.cxx | 140 ++--
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/cuifmsearch.cxx | 2
cui/source/dialogs/cuihyperdlg.cxx | 8
cui/source/dialogs/screenshotannotationdlg.cxx | 2
cui/source/options/optgdlg.cxx | 2
cui/source/tabpages/border.cxx | 4
cui/source/tabpages/tpline.cxx | 2
80 files changed, 1108 insertions(+), 1582 deletions(-)
New commits:
commit 4c09f8e087cae598efbb78759110c03ed10e3a3a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Sep 8 16:55:37 2017 +0200
clang-tidy modernize-use-emplace in c*
Change-Id: I419d1f67ba301050d05981db2a3d6178878684a9
Reviewed-on: https://gerrit.libreoffice.org/42110
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index bb6b38d98765..bac25404379b 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -334,8 +334,8 @@ namespace cairocanvas
{
if( aFontData.empty() || aGlyphIter->fallbacklevel != aFontData.back().second )
{
- aFontData.push_back(FontLevel(rOutDev.GetSysFontData(aGlyphIter->fallbacklevel),
- aGlyphIter->fallbacklevel));
+ aFontData.emplace_back(rOutDev.GetSysFontData(aGlyphIter->fallbacklevel),
+ aGlyphIter->fallbacklevel);
if( !isCairoRenderable(aFontData.back().first) )
{
bCairoRenderable = false;
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index 535f09c63727..5a846aef7bb3 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -168,15 +168,15 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
Sequence<OUString> implementationList;
if( (xEntryNameAccess->getByName("PreferredImplementations") >>= implementationList) )
{
- m_aAvailableImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+ m_aAvailableImplementations.emplace_back(*pCurr,implementationList );
}
if( (xEntryNameAccess->getByName("AcceleratedImplementations") >>= implementationList) )
{
- m_aAcceleratedImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+ m_aAcceleratedImplementations.emplace_back(*pCurr,implementationList );
}
if( (xEntryNameAccess->getByName("AntialiasingImplementations") >>= implementationList) )
{
- m_aAAImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+ m_aAAImplementations.emplace_back(*pCurr,implementationList );
}
}
@@ -198,12 +198,12 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
// Ugh. Looks like configuration is borked. Fake minimal
// setup.
Sequence<OUString> aServices { "com.sun.star.comp.rendering.Canvas.VCL" };
- m_aAvailableImplementations.push_back( std::make_pair(OUString("com.sun.star.rendering.Canvas"),
- aServices) );
+ m_aAvailableImplementations.emplace_back(OUString("com.sun.star.rendering.Canvas"),
+ aServices );
aServices[0] = "com.sun.star.comp.rendering.SpriteCanvas.VCL";
- m_aAvailableImplementations.push_back( std::make_pair(OUString("com.sun.star.rendering.SpriteCanvas"),
- aServices) );
+ m_aAvailableImplementations.emplace_back(OUString("com.sun.star.rendering.SpriteCanvas"),
+ aServices );
}
}
@@ -428,8 +428,8 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
else
{
// new service name, add new cache entry
- m_aCachedImplementations.push_back(std::make_pair(serviceName,
- pCurrImpl->trim()));
+ m_aCachedImplementations.emplace_back(serviceName,
+ pCurrImpl->trim());
}
return xCanvas;
diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index 3cf44368c3f8..971ad9af4ab1 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -468,19 +468,19 @@ namespace canvas
const ::basegfx::B2DPoint& rNewPos,
const ::basegfx::B2DVector& rSpriteSize )
{
- maChangeRecords.push_back( SpriteChangeRecord( rSprite,
- rOldPos,
- rNewPos,
- rSpriteSize ) );
+ maChangeRecords.emplace_back( rSprite,
+ rOldPos,
+ rNewPos,
+ rSpriteSize );
}
void SpriteRedrawManager::updateSprite( const Sprite::Reference& rSprite,
const ::basegfx::B2DPoint& rPos,
const ::basegfx::B2DRange& rUpdateArea )
{
- maChangeRecords.push_back( SpriteChangeRecord( rSprite,
- rPos,
- rUpdateArea ) );
+ maChangeRecords.emplace_back( rSprite,
+ rPos,
+ rUpdateArea );
}
}
diff --git a/chart2/qa/unit/common_functor_test.cxx b/chart2/qa/unit/common_functor_test.cxx
index c630455b4ad8..43fcd0c6ad84 100644
--- a/chart2/qa/unit/common_functor_test.cxx
+++ b/chart2/qa/unit/common_functor_test.cxx
@@ -38,13 +38,13 @@ private:
void CommonFunctorsTest::testAnyToString()
{
std::vector<css::uno::Any> aInput;
- aInput.push_back(css::uno::Any(2.0));
- aInput.push_back(css::uno::Any(10.0));
- aInput.push_back(css::uno::Any(12.0));
- aInput.push_back(css::uno::Any(15.0));
- aInput.push_back(css::uno::Any(25.234));
- aInput.push_back(css::uno::Any(123.456));
- aInput.push_back(css::uno::Any(0.123450));
+ aInput.emplace_back(2.0);
+ aInput.emplace_back(10.0);
+ aInput.emplace_back(12.0);
+ aInput.emplace_back(15.0);
+ aInput.emplace_back(25.234);
+ aInput.emplace_back(123.456);
+ aInput.emplace_back(0.123450);
std::vector<OUString> aOutput;
std::transform(aInput.begin(), aInput.end(),
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 53e21e9cce90..3ec838833f1d 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -105,262 +105,226 @@ void lcl_AddPropertiesToVector(
std::vector< Property > & rOutProperties )
{
//Properties for scaling:
- rOutProperties.push_back(
- Property( "Max",
+ rOutProperties.emplace_back( "Max",
PROP_AXIS_MAX,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "Min",
+ rOutProperties.emplace_back( "Min",
PROP_AXIS_MIN,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "StepMain",
+ rOutProperties.emplace_back( "StepMain",
PROP_AXIS_STEPMAIN,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "StepHelpCount",
+ rOutProperties.emplace_back( "StepHelpCount",
PROP_AXIS_STEPHELP_COUNT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
//deprecated property use 'StepHelpCount' instead
- rOutProperties.push_back(
- Property( "StepHelp",
+ rOutProperties.emplace_back( "StepHelp",
PROP_AXIS_STEPHELP,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "AutoMax",
+ rOutProperties.emplace_back( "AutoMax",
PROP_AXIS_AUTO_MAX,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "AutoMin",
+ rOutProperties.emplace_back( "AutoMin",
PROP_AXIS_AUTO_MIN,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "AutoStepMain",
+ rOutProperties.emplace_back( "AutoStepMain",
PROP_AXIS_AUTO_STEPMAIN,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "AutoStepHelp",
+ rOutProperties.emplace_back( "AutoStepHelp",
PROP_AXIS_AUTO_STEPHELP,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "AxisType",
+ rOutProperties.emplace_back( "AxisType",
PROP_AXIS_TYPE,
cppu::UnoType<sal_Int32>::get(), //type css::chart::ChartAxisType
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TimeIncrement",
+ rOutProperties.emplace_back( "TimeIncrement",
PROP_AXIS_TIME_INCREMENT,
cppu::UnoType<css::chart::TimeIncrement>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "ExplicitTimeIncrement",
+ rOutProperties.emplace_back( "ExplicitTimeIncrement",
PROP_AXIS_EXPLICIT_TIME_INCREMENT,
cppu::UnoType<css::chart::TimeIncrement>::get(),
beans::PropertyAttribute::READONLY |
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "Logarithmic",
+ rOutProperties.emplace_back( "Logarithmic",
PROP_AXIS_LOGARITHMIC,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "ReverseDirection",
+ rOutProperties.emplace_back( "ReverseDirection",
PROP_AXIS_REVERSEDIRECTION,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
//todo: this property is missing in the API
- rOutProperties.push_back(
- Property( "Visible",
+ rOutProperties.emplace_back( "Visible",
PROP_AXIS_VISIBLE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "CrossoverPosition",
+ rOutProperties.emplace_back( "CrossoverPosition",
PROP_AXIS_CROSSOVER_POSITION,
cppu::UnoType<css::chart::ChartAxisPosition>::get(),
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "CrossoverValue",
+ rOutProperties.emplace_back( "CrossoverValue",
PROP_AXIS_CROSSOVER_VALUE,
cppu::UnoType<double>::get(),
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "Origin",
+ rOutProperties.emplace_back( "Origin",
PROP_AXIS_ORIGIN,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "AutoOrigin",
+ rOutProperties.emplace_back( "AutoOrigin",
PROP_AXIS_AUTO_ORIGIN,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
//Properties for interval marks:
- rOutProperties.push_back(
- Property( "Marks",
+ rOutProperties.emplace_back( "Marks",
PROP_AXIS_MARKS,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "HelpMarks",
+ rOutProperties.emplace_back( "HelpMarks",
PROP_AXIS_HELPMARKS,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "MarkPosition",
+ rOutProperties.emplace_back( "MarkPosition",
PROP_AXIS_MARK_POSITION,
cppu::UnoType<css::chart::ChartAxisMarkPosition>::get(),
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
//Properties for labels:
- rOutProperties.push_back(
- Property( "DisplayLabels",
+ rOutProperties.emplace_back( "DisplayLabels",
PROP_AXIS_DISPLAY_LABELS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_NUMFMT,
+ rOutProperties.emplace_back( CHART_UNONAME_NUMFMT,
PROP_AXIS_NUMBERFORMAT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_LINK_TO_SRC_NUMFMT,
+ rOutProperties.emplace_back( CHART_UNONAME_LINK_TO_SRC_NUMFMT,
PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "LabelPosition",
+ rOutProperties.emplace_back( "LabelPosition",
PROP_AXIS_LABEL_POSITION,
cppu::UnoType<css::chart::ChartAxisLabelPosition>::get(),
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TextRotation",
+ rOutProperties.emplace_back( "TextRotation",
PROP_AXIS_TEXT_ROTATION,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "ArrangeOrder",
+ rOutProperties.emplace_back( "ArrangeOrder",
PROP_AXIS_ARRANGE_ORDER,
cppu::UnoType<css::chart::ChartAxisArrangeOrderType>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TextBreak",
+ rOutProperties.emplace_back( "TextBreak",
PROP_AXIS_TEXTBREAK,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TextCanOverlap",
+ rOutProperties.emplace_back( "TextCanOverlap",
PROP_AXIS_CAN_OVERLAP,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "StackedText",
+ rOutProperties.emplace_back( "StackedText",
PROP_AXIS_STACKEDTEXT,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// Properties related to bar charts:
- rOutProperties.push_back(
- Property( "Overlap",
+ rOutProperties.emplace_back( "Overlap",
PROP_AXIS_OVERLAP,
cppu::UnoType<sal_Int32>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "GapWidth",
+ rOutProperties.emplace_back( "GapWidth",
PROP_AXIS_GAP_WIDTH,
cppu::UnoType<sal_Int32>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
//Properties for display units:
- rOutProperties.push_back(
- Property( "DisplayUnits",
+ rOutProperties.emplace_back( "DisplayUnits",
PROP_AXIS_DISPLAY_UNITS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
//Properties for labels:
- rOutProperties.push_back(
- Property( "BuiltInUnit",
+ rOutProperties.emplace_back( "BuiltInUnit",
PROP_AXIS_BUILTINUNIT,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// Compatibility option: starting from LibreOffice 5.1 the rotated
// layout is preferred to staggering for axis labels.
- rOutProperties.push_back(
- Property( "TryStaggeringFirst",
+ rOutProperties.emplace_back( "TryStaggeringFirst",
PROP_AXIS_TRY_STAGGERING_FIRST,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
struct StaticAxisWrapperPropertyArray_Initializer
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index daa633e01eed..589e8ad45a48 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -154,85 +154,73 @@ enum
void lcl_AddPropertiesToVector(
std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "HasMainTitle",
+ rOutProperties.emplace_back( "HasMainTitle",
PROP_DOCUMENT_HAS_MAIN_TITLE,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasSubTitle",
+ beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasSubTitle",
PROP_DOCUMENT_HAS_SUB_TITLE,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "HasLegend",
+ beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "HasLegend",
PROP_DOCUMENT_HAS_LEGEND,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
// really needed?
- rOutProperties.push_back(
- Property( "DataSourceLabelsInFirstRow",
+ rOutProperties.emplace_back( "DataSourceLabelsInFirstRow",
PROP_DOCUMENT_LABELS_IN_FIRST_ROW,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "DataSourceLabelsInFirstColumn",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "DataSourceLabelsInFirstColumn",
PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
//add-in
- rOutProperties.push_back(
- Property( "AddIn",
+ rOutProperties.emplace_back( "AddIn",
PROP_DOCUMENT_ADDIN,
cppu::UnoType<util::XRefreshable>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
- rOutProperties.push_back(
- Property( "BaseDiagram",
+ | beans::PropertyAttribute::MAYBEVOID );
+ rOutProperties.emplace_back( "BaseDiagram",
PROP_DOCUMENT_BASEDIAGRAM,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
- rOutProperties.push_back(
- Property( "AdditionalShapes",
+ | beans::PropertyAttribute::MAYBEVOID );
+ rOutProperties.emplace_back( "AdditionalShapes",
PROP_DOCUMENT_ADDITIONAL_SHAPES,
cppu::UnoType<drawing::XShapes>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
- | beans::PropertyAttribute::READONLY ));
- rOutProperties.push_back(
- Property( "RefreshAddInAllowed",
+ | beans::PropertyAttribute::READONLY );
+ rOutProperties.emplace_back( "RefreshAddInAllowed",
PROP_DOCUMENT_UPDATE_ADDIN,
cppu::UnoType<bool>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::TRANSIENT ));
+ beans::PropertyAttribute::TRANSIENT );
// table:null-date // i99104
- rOutProperties.push_back(
- Property( "NullDate",
+ rOutProperties.emplace_back( "NullDate",
PROP_DOCUMENT_NULL_DATE,
::cppu::UnoType<css::util::DateTime>::get(),
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "EnableComplexChartTypes",
+ rOutProperties.emplace_back( "EnableComplexChartTypes",
PROP_DOCUMENT_ENABLE_COMPLEX_CHARTTYPES,
cppu::UnoType<bool>::get(),
//#i112666# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ) );
- rOutProperties.push_back(
- Property( "EnableDataTableDialog",
+ beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "EnableDataTableDialog",
PROP_DOCUMENT_ENABLE_DATATABLE_DIALOG,
cppu::UnoType<bool>::get(),
//#i112666# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ) );
+ beans::PropertyAttribute::MAYBEDEFAULT );
}
struct StaticChartDocumentWrapperPropertyArray_Initializer
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 52d59ff21b54..12c49d0bf6cd 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -92,115 +92,100 @@ void lcl_AddPropertiesToVector_PointProperties(
std::vector< Property > & rOutProperties )
{
//service chart::Chart3DBarProperties
- rOutProperties.push_back(
- Property( "SolidType",
+ rOutProperties.emplace_back( "SolidType",
PROP_SERIES_DATAPOINT_SOLIDTYPE,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "SegmentOffset",
+ rOutProperties.emplace_back( "SegmentOffset",
PROP_SERIES_DATAPOINT_SEGMENT_OFFSET,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "D3DPercentDiagonal",
+ rOutProperties.emplace_back( "D3DPercentDiagonal",
PROP_SERIES_DATAPOINT_PERCENT_DIAGONAL,
cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "LabelSeparator",
+ rOutProperties.emplace_back( "LabelSeparator",
PROP_SERIES_DATAPOINT_LABEL_SEPARATOR,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_NUMFMT,
+ rOutProperties.emplace_back( CHART_UNONAME_NUMFMT,
PROP_SERIES_NUMBERFORMAT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "PercentageNumberFormat",
+ rOutProperties.emplace_back( "PercentageNumberFormat",
PROP_SERIES_PERCENTAGE_NUMBERFORMAT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "TextWordWrap",
+ rOutProperties.emplace_back( "TextWordWrap",
PROP_SERIES_DATAPOINT_TEXT_WORD_WRAP,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "LabelPlacement",
+ rOutProperties.emplace_back( "LabelPlacement",
PROP_SERIES_DATAPOINT_LABEL_PLACEMENT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "TextRotation",
+ rOutProperties.emplace_back( "TextRotation",
PROP_SERIES_DATAPOINT_TEXT_ROTATION,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_LABEL_BORDER_STYLE,
+ rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_STYLE,
PROP_SERIES_DATAPOINT_LABEL_BORDER_STYLE,
cppu::UnoType<drawing::LineStyle>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_LABEL_BORDER_WIDTH,
+ rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_WIDTH,
PROP_SERIES_DATAPOINT_LABEL_BORDER_WIDTH,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_LABEL_BORDER_COLOR,
+ rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_COLOR,
PROP_SERIES_DATAPOINT_LABEL_BORDER_COLOR,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID // "maybe auto"
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_LABEL_BORDER_TRANS,
+ rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_TRANS,
PROP_SERIES_DATAPOINT_LABEL_BORDER_TRANS,
cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
void lcl_AddPropertiesToVector_SeriesOnly(
std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "Axis",
+ rOutProperties.emplace_back( "Axis",
PROP_SERIES_ATTACHED_AXIS,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_LINK_TO_SRC_NUMFMT,
+ rOutProperties.emplace_back( CHART_UNONAME_LINK_TO_SRC_NUMFMT,
PROP_SERIES_LINK_NUMBERFORMAT_TO_SOURCE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType _eType )
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
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 5f763c67a272..0a3829a96e9f 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -211,19 +211,17 @@ enum
void lcl_AddPropertiesToVector(
std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "Alignment",
+ rOutProperties.emplace_back( "Alignment",
PROP_LEGEND_ALIGNMENT,
cppu::UnoType<css::chart::ChartLegendPosition>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "Expansion",
+ rOutProperties.emplace_back( "Expansion",
PROP_LEGEND_EXPANSION,
cppu::UnoType<css::chart::ChartLegendExpansion>::get(),
//#i111967# no PropertyChangeEvent is fired on change so far
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
}
struct StaticLegendWrapperPropertyArray_Initializer
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index bd4e44614e88..8a1c597acb74 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -123,25 +123,22 @@ enum
void lcl_AddPropertiesToVector(
std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "String",
+ rOutProperties.emplace_back( "String",
PROP_TITLE_STRING,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "TextRotation",
+ rOutProperties.emplace_back( "TextRotation",
PROP_TITLE_TEXT_ROTATION,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "StackedText",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "StackedText",
PROP_TITLE_TEXT_STACKED,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
struct StaticTitleWrapperPropertyArray_Initializer
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 663d9c8dd2c5..969d270a971c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -107,12 +107,11 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList )
void WrappedAutomaticPositionProperties::addProperties( std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "AutomaticPosition",
+ rOutProperties.emplace_back( "AutomaticPosition",
PROP_CHART_AUTOMATIC_POSITION,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index f49014b1f25d..bd4b3a33c1fd 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -100,12 +100,11 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
void WrappedDataCaptionProperties::addProperties( std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "DataCaption",
+ rOutProperties.emplace_back( "DataCaption",
PROP_CHART_DATAPOINT_DATA_CAPTION,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index c4ca7e73931f..220195fc24e8 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -115,13 +115,11 @@ public:
void WrappedGL3DProperties::addProperties( std::vector<css::beans::Property> & rOutProps )
{
- rOutProps.push_back(
- beans::Property(
+ rOutProps.emplace_back(
CHART_UNONAME_ROUNDED_EDGE,
PROP_GL3DCHARTTYPE_ROUNDED_EDGE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT
- )
);
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 1c3871ede3fd..a3bde4974aee 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -114,12 +114,11 @@ enum
void WrappedScaleTextProperties::addProperties( std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "ScaleText",
+ rOutProperties.emplace_back( "ScaleText",
PROP_CHART_SCALE_TEXT,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::MAYBEVOID
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 449b347057bf..977dba6aec11 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -177,27 +177,24 @@ enum
void WrappedSplineProperties::addProperties( std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( CHART_UNONAME_SPLINE_TYPE,
+ rOutProperties.emplace_back( CHART_UNONAME_SPLINE_TYPE,
PROP_CHART_SPLINE_TYPE,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
- rOutProperties.push_back(
- Property( CHART_UNONAME_SPLINE_ORDER,
+ | beans::PropertyAttribute::MAYBEVOID );
+ rOutProperties.emplace_back( CHART_UNONAME_SPLINE_ORDER,
PROP_CHART_SPLINE_ORDER,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
- rOutProperties.push_back(
- Property( CHART_UNONAME_SPLINE_RESOLUTION,
+ | beans::PropertyAttribute::MAYBEVOID );
+ rOutProperties.emplace_back( CHART_UNONAME_SPLINE_RESOLUTION,
PROP_CHART_SPLINE_RESOLUTION,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
}
void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index f0f5f76e8f71..4f67de5f58e1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -939,94 +939,80 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
void WrappedStatisticProperties::addProperties( std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "ConstantErrorLow",
+ rOutProperties.emplace_back( "ConstantErrorLow",
PROP_CHART_STATISTIC_CONST_ERROR_LOW,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ConstantErrorHigh",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ConstantErrorHigh",
PROP_CHART_STATISTIC_CONST_ERROR_HIGH,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "MeanValue",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "MeanValue",
PROP_CHART_STATISTIC_MEAN_VALUE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ErrorCategory",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ErrorCategory",
PROP_CHART_STATISTIC_ERROR_CATEGORY,
cppu::UnoType<css::chart::ChartErrorCategory>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ErrorBarStyle",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ErrorBarStyle",
PROP_CHART_STATISTIC_ERROR_BAR_STYLE,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "PercentageError",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "PercentageError",
PROP_CHART_STATISTIC_PERCENT_ERROR,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ErrorMargin",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ErrorMargin",
PROP_CHART_STATISTIC_ERROR_MARGIN,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ErrorIndicator",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ErrorIndicator",
PROP_CHART_STATISTIC_ERROR_INDICATOR,
cppu::UnoType<css::chart::ChartErrorIndicatorType>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ErrorBarRangePositive",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ErrorBarRangePositive",
PROP_CHART_STATISTIC_ERROR_RANGE_POSITIVE,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "ErrorBarRangeNegative",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "ErrorBarRangeNegative",
PROP_CHART_STATISTIC_ERROR_RANGE_NEGATIVE,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "RegressionCurves",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "RegressionCurves",
PROP_CHART_STATISTIC_REGRESSION_CURVES,
cppu::UnoType<css::chart::ChartRegressionCurveType>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "DataRegressionProperties",
+ rOutProperties.emplace_back( "DataRegressionProperties",
PROP_CHART_STATISTIC_REGRESSION_PROPERTIES,
cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
- | beans::PropertyAttribute::MAYBEVOID ));
- rOutProperties.push_back(
- Property( "DataErrorProperties",
+ | beans::PropertyAttribute::MAYBEVOID );
+ rOutProperties.emplace_back( "DataErrorProperties",
PROP_CHART_STATISTIC_ERROR_PROPERTIES,
cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
- | beans::PropertyAttribute::MAYBEVOID ));
- rOutProperties.push_back(
- Property( "DataMeanValueProperties",
+ | beans::PropertyAttribute::MAYBEVOID );
+ rOutProperties.emplace_back( "DataMeanValueProperties",
PROP_CHART_STATISTIC_MEAN_VALUE_PROPERTIES,
cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
}
void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 831ff67bcccc..0500f6e0ea28 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -243,20 +243,18 @@ enum
void WrappedStockProperties::addProperties( std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "Volume",
+ rOutProperties.emplace_back( "Volume",
PROP_CHART_STOCK_VOLUME,
cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
- rOutProperties.push_back(
- Property( "UpDown",
+ | beans::PropertyAttribute::MAYBEVOID );
+ rOutProperties.emplace_back( "UpDown",
PROP_CHART_STOCK_UPDOWN,
cppu::UnoType<sal_Bool>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
}
void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index ec1683ba8038..0ff88db194e7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -164,33 +164,29 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
void WrappedSymbolProperties::addProperties( std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "SymbolType",
+ rOutProperties.emplace_back( "SymbolType",
PROP_CHART_SYMBOL_TYPE,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "SymbolBitmapURL",
+ rOutProperties.emplace_back( "SymbolBitmapURL",
PROP_CHART_SYMBOL_BITMAP_URL,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "SymbolSize",
+ rOutProperties.emplace_back( "SymbolSize",
PROP_CHART_SYMBOL_SIZE,
cppu::UnoType<awt::Size>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "Lines",
+ rOutProperties.emplace_back( "Lines",
PROP_CHART_SYMBOL_AND_LINES,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 4d9c53c9c73f..e8b8c576865b 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -880,13 +880,12 @@ void DataBrowserModel::updateFromModel()
lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end())
{
// no shared sequence
- m_aColumns.push_back(
- tDataColumn(
+ m_aColumns.emplace_back(
aSeries[nSeriesIdx],
lcl_getUIRoleName( aLSeqs[nSeqIdx] ),
aLSeqs[nSeqIdx],
NUMBER,
- nSequenceNumberFormatKey ));
+ nSequenceNumberFormatKey );
++nHeaderEnd;
}
// else skip
@@ -906,13 +905,12 @@ void DataBrowserModel::updateFromModel()
if( StatisticsHelper::usesErrorBarRanges( aSeries[nSeriesIdx], /* bYError = */ false ))
addErrorBarRanges( aSeries[nSeriesIdx], nYAxisNumberFormatKey, nSeqIdx, nHeaderEnd, false );
- m_aHeaders.push_back(
- tDataHeader(
+ m_aHeaders.emplace_back(
aSeries[nSeriesIdx],
aChartTypes[nCTIdx],
bSwapXAndYAxis,
nHeaderStart,
- nHeaderEnd - 1 ));
+ nHeaderEnd - 1 );
nHeaderStart = nHeaderEnd;
@@ -955,8 +953,8 @@ void DataBrowserModel::addErrorBarRanges(
for (Reference<chart2::data::XLabeledDataSequence> const & rDataSequence : aSequences)
{
- m_aColumns.push_back(tDataColumn(xDataSeries, lcl_getUIRoleName(rDataSequence),
- rDataSequence, NUMBER, nNumberFormatKey));
+ m_aColumns.emplace_back(xDataSeries, lcl_getUIRoleName(rDataSequence),
+ rDataSequence, NUMBER, nNumberFormatKey);
++rInOutSequenceIndex;
++rInOutHeaderEnd;
}
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 9cd4f9a57a9c..6422f43511da 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -47,7 +47,7 @@ std::vector< OUString > lcl_getStringsFromByteSequence(
{
if( pBytes[nPos] == '\0' )
{
- aResult.push_back( OUString( pBytes + nStartPos, (nPos - nStartPos), RTL_TEXTENCODING_ASCII_US ));
+ aResult.emplace_back( pBytes + nStartPos, (nPos - nStartPos), RTL_TEXTENCODING_ASCII_US );
nStartPos = nPos + 1;
}
}
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 5ad221ea876d..9141edb31fc5 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -179,13 +179,13 @@ Reference< frame::XDispatch > CommandDispatchContainer::getContainerDispatchForU
void CommandDispatchContainer::setDrawCommandDispatch( DrawCommandDispatch* pDispatch )
{
m_pDrawCommandDispatch = pDispatch;
- m_aToBeDisposedDispatches.push_back( Reference< frame::XDispatch >( pDispatch ) );
+ m_aToBeDisposedDispatches.emplace_back( pDispatch );
}
void CommandDispatchContainer::setShapeController( ShapeController* pController )
{
m_pShapeController = pController;
- m_aToBeDisposedDispatches.push_back( Reference< frame::XDispatch >( pController ) );
+ m_aToBeDisposedDispatches.emplace_back( pController );
}
} // namespace chart
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 6f872f17a062..45b826a51b80 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -89,7 +89,7 @@ void lcl_getChildOIDs(
!aName.isEmpty() &&
::chart::ObjectIdentifier::isCID( aName ))
{
- rOutChildren.push_back( ::chart::ObjectIdentifier( aName ) );
+ rOutChildren.emplace_back( aName );
}
Reference< container::XIndexAccess > xNewShapes( xShapeProp, uno::UNO_QUERY );
if( xNewShapes.is())
@@ -106,8 +106,7 @@ void lcl_addAxisTitle( const Reference< XAxis >& xAxis, ::chart::ObjectHierarchy
{
Reference< XTitle > xAxisTitle( xAxisTitled->getTitleObject());
if( xAxisTitle.is())
- rContainer.push_back(
- ::chart::ObjectIdentifier( ::chart::ObjectIdentifier::createClassifiedIdentifierForObject( xAxisTitle, xChartModel ) ) );
+ rContainer.emplace_back( ::chart::ObjectIdentifier::createClassifiedIdentifierForObject( xAxisTitle, xChartModel ) );
}
}
@@ -201,7 +200,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD
// Chart Area
if( m_bOrderingForElementSelector )
{
- aTopLevelContainer.push_back( ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
+ aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
if( xDiagram.is() )
{
aTopLevelContainer.push_back( aDiaOID );
@@ -216,8 +215,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD
{
Reference< XTitle > xMainTitle( xDocTitled->getTitleObject());
if( xMainTitle.is())
- aTopLevelContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForObject( xMainTitle, xModel ) ) );
+ aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForObject( xMainTitle, xModel ) );
}
if( xDiagram.is())
@@ -228,8 +226,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD
{
Reference< XTitle > xSubTitle( xDiaTitled->getTitleObject());
if( xSubTitle.is())
- aTopLevelContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForObject( xSubTitle, xModel ) ) );
+ aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForObject( xSubTitle, xModel ) );
}
if( !m_bOrderingForElementSelector )
@@ -265,8 +262,7 @@ void ImplObjectHierarchy::createTree( const Reference< XChartDocument >& xChartD
// Chart Area
if( !m_bOrderingForElementSelector )
- aTopLevelContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
+ aTopLevelContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
if( ! aTopLevelContainer.empty())
m_aChildMap[ ObjectHierarchy::getRootNodeOID() ] = aTopLevelContainer;
@@ -333,8 +329,7 @@ void ImplObjectHierarchy::createAxesTree(
{
// axis
if( AxisHelper::isAxisVisible( xAxis ) )
- rContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, xChartModel ) ) );
+ rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, xChartModel ) );
// axis title
lcl_addAxisTitle( aAxes[nA], rContainer, xChartModel );
@@ -344,8 +339,7 @@ void ImplObjectHierarchy::createAxesTree(
if( AxisHelper::isGridVisible( xGridProperties ) )
{
//main grid
- rContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel ) ) );
+ rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel ) );
}
Sequence< Reference< beans::XPropertySet > > aSubGrids( xAxis->getSubGridProperties() );
@@ -356,8 +350,7 @@ void ImplObjectHierarchy::createAxesTree(
if( AxisHelper::isGridVisible( xSubGridProperties ) )
{
//sub grid
- rContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel, nSubGrid ) ) );
+ rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForGrid( xAxis, xChartModel, nSubGrid ) );
}
}
}
@@ -373,13 +366,11 @@ void ImplObjectHierarchy::createWallAndFloor(
bool bHasWall = DiagramHelper::isSupportingFloorAndWall( xDiagram );
if( bHasWall && bIsThreeD )
{
- rContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) ) );
+ rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );
Reference< beans::XPropertySet > xFloor( xDiagram->getFloor());
if( xFloor.is())
- rContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) ) );
+ rContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) );
}
}
@@ -443,8 +434,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
{
OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
aChildParticle+=("=");
- aSeriesSubContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) );
+ aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) );
}
// Statistics
@@ -457,12 +447,10 @@ void ImplObjectHierarchy::createDataSeriesTree(
for( sal_Int32 nCurveIdx=0; nCurveIdx<aCurves.getLength(); ++nCurveIdx )
{
bool bIsAverageLine = RegressionCurveHelper::isMeanValueLine( aCurves[nCurveIdx] );
- aSeriesSubContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createDataCurveCID( aSeriesParticle, nCurveIdx, bIsAverageLine ) ) );
+ aSeriesSubContainer.emplace_back( ObjectIdentifier::createDataCurveCID( aSeriesParticle, nCurveIdx, bIsAverageLine ) );
if( RegressionCurveHelper::hasEquation( aCurves[nCurveIdx] ) )
{
- aSeriesSubContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createDataCurveEquationCID( aSeriesParticle, nCurveIdx ) ) );
+ aSeriesSubContainer.emplace_back( ObjectIdentifier::createDataCurveEquationCID( aSeriesParticle, nCurveIdx ) );
}
}
Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY );
@@ -475,9 +463,8 @@ void ImplObjectHierarchy::createDataSeriesTree(
if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) &&
( nStyle != css::chart::ErrorBarStyle::NONE ) )
{
- aSeriesSubContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierWithParent(
- OBJECTTYPE_DATA_ERRORS_Y, OUString(), aSeriesParticle ) ) );
+ aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierWithParent(
+ OBJECTTYPE_DATA_ERRORS_Y, OUString(), aSeriesParticle ) );
}
}
@@ -489,9 +476,8 @@ void ImplObjectHierarchy::createDataSeriesTree(
if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) &&
( nStyle != css::chart::ErrorBarStyle::NONE ) )
{
- aSeriesSubContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierWithParent(
- OBJECTTYPE_DATA_ERRORS_X, OUString(), aSeriesParticle ) ) );
+ aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierWithParent(
+ OBJECTTYPE_DATA_ERRORS_X, OUString(), aSeriesParticle ) );
}
}
}
@@ -535,7 +521,7 @@ void ImplObjectHierarchy::createAdditionalShapesTree( ObjectHierarchy::tChildCon
{
if ( xShape.is() && xShape != xChartRoot )
{
- rContainer.push_back( ObjectIdentifier( xShape ) );
+ rContainer.emplace_back( xShape );
}
}
}
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 0f78c8b16776..5545d9dffd9e 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -87,136 +87,117 @@ enum
void lcl_AddPropertiesToVector(
std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "Show",
+ rOutProperties.emplace_back( "Show",
PROP_AXIS_SHOW,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "CrossoverPosition",
+ rOutProperties.emplace_back( "CrossoverPosition",
PROP_AXIS_CROSSOVER_POSITION,
cppu::UnoType<css::chart::ChartAxisPosition>::get(),
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "CrossoverValue",
+ rOutProperties.emplace_back( "CrossoverValue",
PROP_AXIS_CROSSOVER_VALUE,
cppu::UnoType<double>::get(),
- beans::PropertyAttribute::MAYBEVOID ));
+ beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "DisplayLabels",
+ rOutProperties.emplace_back( "DisplayLabels",
PROP_AXIS_DISPLAY_LABELS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_NUMFMT,
+ rOutProperties.emplace_back( CHART_UNONAME_NUMFMT,
PROP_AXIS_NUMBERFORMAT,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( CHART_UNONAME_LINK_TO_SRC_NUMFMT,
+ rOutProperties.emplace_back( CHART_UNONAME_LINK_TO_SRC_NUMFMT,
PROP_AXIS_LINK_NUMBERFORMAT_TO_SOURCE,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "LabelPosition",
+ rOutProperties.emplace_back( "LabelPosition",
PROP_AXIS_LABEL_POSITION,
cppu::UnoType<css::chart::ChartAxisLabelPosition>::get(),
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TextRotation",
+ rOutProperties.emplace_back( "TextRotation",
PROP_AXIS_TEXT_ROTATION,
cppu::UnoType<double>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TextBreak",
+ rOutProperties.emplace_back( "TextBreak",
PROP_AXIS_TEXT_BREAK,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TextOverlap",
+ rOutProperties.emplace_back( "TextOverlap",
PROP_AXIS_TEXT_OVERLAP,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "StackCharacters",
+ rOutProperties.emplace_back( "StackCharacters",
PROP_AXIS_TEXT_STACKED,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "ArrangeOrder",
+ rOutProperties.emplace_back( "ArrangeOrder",
PROP_AXIS_TEXT_ARRANGE_ORDER,
cppu::UnoType<css::chart::ChartAxisArrangeOrderType>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "ReferencePageSize",
+ rOutProperties.emplace_back( "ReferencePageSize",
PROP_AXIS_REFERENCE_DIAGRAM_SIZE,
cppu::UnoType<awt::Size>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "MajorTickmarks",
+ rOutProperties.emplace_back( "MajorTickmarks",
PROP_AXIS_MAJOR_TICKMARKS,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "MinorTickmarks",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "MinorTickmarks",
PROP_AXIS_MINOR_TICKMARKS,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
- rOutProperties.push_back(
- Property( "MarkPosition",
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+ rOutProperties.emplace_back( "MarkPosition",
PROP_AXIS_MARK_POSITION,
cppu::UnoType<css::chart::ChartAxisMarkPosition>::get(),
- beans::PropertyAttribute::MAYBEDEFAULT ));
+ beans::PropertyAttribute::MAYBEDEFAULT );
//Properties for display units:
- rOutProperties.push_back(
- Property( "DisplayUnits",
+ rOutProperties.emplace_back( "DisplayUnits",
PROP_AXIS_DISPLAY_UNITS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
//Properties for labels:
- rOutProperties.push_back(
- Property( "BuiltInUnit",
+ rOutProperties.emplace_back( "BuiltInUnit",
PROP_AXIS_BUILTINUNIT,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// Compatibility option: starting from LibreOffice 5.1 the rotated
// layout is preferred to staggering for axis labels.
- rOutProperties.push_back(
- Property( "TryStaggeringFirst",
+ rOutProperties.emplace_back( "TryStaggeringFirst",
PROP_AXIS_TRY_STAGGERING_FIRST,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
}
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index f6043b0d5cdc..c094ea2eec32 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -48,12 +48,11 @@ enum
void lcl_AddPropertiesToVector(
std::vector< Property > & rOutProperties )
{
- rOutProperties.push_back(
- Property( "SwapXAndYAxis",
+ rOutProperties.emplace_back( "SwapXAndYAxis",
PROP_COORDINATESYSTEM_SWAPXANDYAXIS,
cppu::UnoType<bool>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
}
struct StaticCooSysDefaults_Initializer
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index fddebed2f705..9255b0fd4e21 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -624,7 +624,7 @@ void ChartModel::impl_loadGraphics(
*apIStm.get(),
aGraphic ) )
{
- m_aGraphicObjectVector.push_back( aGraphic );
+ m_aGraphicObjectVector.emplace_back(aGraphic );
}
}
}
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 18b4fe49f85a..aba1f91e31ca 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -50,420 +50,363 @@ void DataPointProperties::AddPropertiesToVector(
// Common
- rOutProperties.push_back(
- Property( "Color",
+ rOutProperties.emplace_back( "Color",
PROP_DATAPOINT_COLOR,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID // "maybe auto"
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "FillColor",
+ rOutProperties.emplace_back( "FillColor",
PROP_DATAPOINT_COLOR,
cppu::UnoType<sal_Int32>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID // "maybe auto"
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "Transparency",
+ rOutProperties.emplace_back( "Transparency",
PROP_DATAPOINT_TRANSPARENCY,
cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "FillTransparence",
+ rOutProperties.emplace_back( "FillTransparence",
PROP_DATAPOINT_TRANSPARENCY,
cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
// Fill Properties
- rOutProperties.push_back(
- Property( "FillStyle",
+ rOutProperties.emplace_back( "FillStyle",
PROP_DATAPOINT_FILL_STYLE,
cppu::UnoType<drawing::FillStyle>::get(),
beans::PropertyAttribute::BOUND
- | beans::PropertyAttribute::MAYBEDEFAULT ));
+ | beans::PropertyAttribute::MAYBEDEFAULT );
- rOutProperties.push_back(
- Property( "TransparencyGradientName",
+ rOutProperties.emplace_back( "TransparencyGradientName",
PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "FillTransparenceGradientName",
+ rOutProperties.emplace_back( "FillTransparenceGradientName",
PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
- rOutProperties.push_back(
- Property( "GradientName",
+ rOutProperties.emplace_back( "GradientName",
PROP_DATAPOINT_GRADIENT_NAME,
cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
- | beans::PropertyAttribute::MAYBEVOID ));
+ | beans::PropertyAttribute::MAYBEVOID );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list