diff options
80 files changed, 1108 insertions, 1582 deletions
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 ); - rOutProperties.push_back( - Property( "FillGradientName", + rOutProperties.emplace_back( "FillGradientName", PROP_DATAPOINT_GRADIENT_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - beans::Property( "GradientStepCount", + rOutProperties.emplace_back( "GradientStepCount", PROP_DATAPOINT_GRADIENT_STEPCOUNT, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - beans::Property( "FillGradientStepCount", + rOutProperties.emplace_back( "FillGradientStepCount", PROP_DATAPOINT_GRADIENT_STEPCOUNT, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "HatchName", + rOutProperties.emplace_back( "HatchName", PROP_DATAPOINT_HATCH_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "FillHatchName", + rOutProperties.emplace_back( "FillHatchName", PROP_DATAPOINT_HATCH_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "FillBitmapName", + rOutProperties.emplace_back( "FillBitmapName", PROP_DATAPOINT_FILL_BITMAP_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "FillBackground", + rOutProperties.emplace_back( "FillBackground", PROP_DATAPOINT_FILL_BACKGROUND, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // border for filled objects - rOutProperties.push_back( - Property( "BorderColor", + rOutProperties.emplace_back( "BorderColor", PROP_DATAPOINT_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( "BorderStyle", + rOutProperties.emplace_back( "BorderStyle", PROP_DATAPOINT_BORDER_STYLE, cppu::UnoType<drawing::LineStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "BorderWidth", + rOutProperties.emplace_back( "BorderWidth", PROP_DATAPOINT_BORDER_WIDTH, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "BorderDashName", + rOutProperties.emplace_back( "BorderDashName", PROP_DATAPOINT_BORDER_DASH_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "BorderTransparency", + rOutProperties.emplace_back( "BorderTransparency", PROP_DATAPOINT_BORDER_TRANSPARENCY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // Line Properties - rOutProperties.push_back( - Property( "LineColor", + rOutProperties.emplace_back( "LineColor", PROP_DATAPOINT_BORDER_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "LineStyle", + rOutProperties.emplace_back( "LineStyle", LinePropertiesHelper::PROP_LINE_STYLE, cppu::UnoType<drawing::LineStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "LineWidth", + rOutProperties.emplace_back( "LineWidth", LinePropertiesHelper::PROP_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "LineDash", + rOutProperties.emplace_back( "LineDash", LinePropertiesHelper::PROP_LINE_DASH, cppu::UnoType<drawing::LineDash>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "LineDashName", + rOutProperties.emplace_back( "LineDashName", LinePropertiesHelper::PROP_LINE_DASH_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "LineTransparence", + rOutProperties.emplace_back( "LineTransparence", PROP_DATAPOINT_BORDER_TRANSPARENCY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // FillProperties // bitmap properties - rOutProperties.push_back( - Property( "FillBitmapOffsetX", + rOutProperties.emplace_back( "FillBitmapOffsetX", FillProperties::PROP_FILL_BITMAP_OFFSETX, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapOffsetY", + rOutProperties.emplace_back( "FillBitmapOffsetY", FillProperties::PROP_FILL_BITMAP_OFFSETY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapPositionOffsetX", + rOutProperties.emplace_back( "FillBitmapPositionOffsetX", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETX, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapPositionOffsetY", + rOutProperties.emplace_back( "FillBitmapPositionOffsetY", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapRectanglePoint", + rOutProperties.emplace_back( "FillBitmapRectanglePoint", FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT, cppu::UnoType<drawing::RectanglePoint>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapLogicalSize", + rOutProperties.emplace_back( "FillBitmapLogicalSize", FillProperties::PROP_FILL_BITMAP_LOGICALSIZE, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapSizeX", + rOutProperties.emplace_back( "FillBitmapSizeX", FillProperties::PROP_FILL_BITMAP_SIZEX, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapSizeY", + rOutProperties.emplace_back( "FillBitmapSizeY", FillProperties::PROP_FILL_BITMAP_SIZEY, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapMode", + rOutProperties.emplace_back( "FillBitmapMode", FillProperties::PROP_FILL_BITMAP_MODE, cppu::UnoType<drawing::BitmapMode>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // others - rOutProperties.push_back( - Property( "Symbol", + rOutProperties.emplace_back( "Symbol", PROP_DATAPOINT_SYMBOL_PROP, cppu::UnoType<chart2::Symbol>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "Offset", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "Offset", PROP_DATAPOINT_OFFSET, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "Geometry3D", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "Geometry3D", PROP_DATAPOINT_GEOMETRY3D, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( CHART_UNONAME_NUMFMT, + rOutProperties.emplace_back( CHART_UNONAME_NUMFMT, PROP_DATAPOINT_NUMBER_FORMAT, 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_DATAPOINT_LINK_NUMBERFORMAT_TO_SOURCE, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); //additional 'PercentageNumberFormat' - rOutProperties.push_back( - Property( "PercentageNumberFormat", + rOutProperties.emplace_back( "PercentageNumberFormat", PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "LabelPlacement", + rOutProperties.emplace_back( "LabelPlacement", PROP_DATAPOINT_LABEL_PLACEMENT, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "ReferencePageSize", + rOutProperties.emplace_back( "ReferencePageSize", PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE, cppu::UnoType<awt::Size>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "TextRotation", + rOutProperties.emplace_back( "TextRotation", PROP_DATAPOINT_TEXT_ROTATION, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // statistics - rOutProperties.push_back( - Property( CHART_UNONAME_ERRORBAR_X, + rOutProperties.emplace_back( CHART_UNONAME_ERRORBAR_X, PROP_DATAPOINT_ERROR_BAR_X, // XPropertySet supporting service ErrorBar cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( CHART_UNONAME_ERRORBAR_Y, + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( CHART_UNONAME_ERRORBAR_Y, PROP_DATAPOINT_ERROR_BAR_Y, // XPropertySet supporting service ErrorBar cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( "ShowErrorBox", + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "ShowErrorBox", PROP_DATAPOINT_SHOW_ERROR_BOX, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( "PercentDiagonal", + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "PercentDiagonal", PROP_DATAPOINT_PERCENT_DIAGONAL, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // Properties specific to data label. - rOutProperties.push_back( - Property( CHART_UNONAME_LABEL, + rOutProperties.emplace_back( CHART_UNONAME_LABEL, PROP_DATAPOINT_LABEL, cppu::UnoType<chart2::DataPointLabel>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "TextWordWrap", + rOutProperties.emplace_back( "TextWordWrap", PROP_DATAPOINT_TEXT_WORD_WRAP, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( CHART_UNONAME_LABEL_SEP, + rOutProperties.emplace_back( CHART_UNONAME_LABEL_SEP, PROP_DATAPOINT_LABEL_SEPARATOR, cppu::UnoType<OUString>::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_DATAPOINT_LABEL_BORDER_STYLE, cppu::UnoType<drawing::LineStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_LABEL_BORDER_COLOR, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_COLOR, PROP_DATAPOINT_LABEL_BORDER_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID // "maybe auto" - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_LABEL_BORDER_WIDTH, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_WIDTH, PROP_DATAPOINT_LABEL_BORDER_WIDTH, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_LABEL_BORDER_DASH, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_DASH, PROP_DATAPOINT_LABEL_BORDER_DASH, cppu::UnoType<drawing::LineDash>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( CHART_UNONAME_LABEL_BORDER_DASHNAME, + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_DASHNAME, PROP_DATAPOINT_LABEL_BORDER_DASH_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( CHART_UNONAME_LABEL_BORDER_TRANS, + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( CHART_UNONAME_LABEL_BORDER_TRANS, PROP_DATAPOINT_LABEL_BORDER_TRANS, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } void DataPointProperties::AddDefaultsToMap( diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 91f24eb4cad6..c4c6dc2d1799 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -37,34 +37,30 @@ namespace chart void DataSeriesProperties::AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "AttributedDataPoints", + rOutProperties.emplace_back( "AttributedDataPoints", PROP_DATASERIES_ATTRIBUTED_DATA_POINTS, cppu::UnoType<uno::Sequence< sal_Int32 >>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "StackingDirection", + rOutProperties.emplace_back( "StackingDirection", PROP_DATASERIES_STACKING_DIRECTION, cppu::UnoType<chart2::StackingDirection>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "VaryColorsByPoint", + rOutProperties.emplace_back( "VaryColorsByPoint", PROP_DATASERIES_VARY_COLORS_BY_POINT, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "AttachedAxisIndex", + rOutProperties.emplace_back( "AttachedAxisIndex", PROP_DATASERIES_ATTACHED_AXIS_INDEX, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // add properties of service DataPointProperties DataPointProperties::AddPropertiesToVector( rOutProperties ); diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index d38130d6e0cd..a03cd098f035 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -83,121 +83,103 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "RelativePosition", + rOutProperties.emplace_back( "RelativePosition", PROP_DIAGRAM_REL_POS, cppu::UnoType<chart2::RelativePosition>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "RelativeSize", + rOutProperties.emplace_back( "RelativeSize", PROP_DIAGRAM_REL_SIZE, cppu::UnoType<chart2::RelativeSize>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "PosSizeExcludeAxes", + rOutProperties.emplace_back( "PosSizeExcludeAxes", PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - 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 ); - rOutProperties.push_back( - Property( "ConnectBars", + rOutProperties.emplace_back( "ConnectBars", PROP_DIAGRAM_CONNECT_BARS, cppu::UnoType<bool>::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 ); - 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 ); - 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 ); - 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 )); - rOutProperties.push_back( - Property( "3DRelativeHeight", + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "3DRelativeHeight", PROP_DIAGRAM_3DRELATIVEHEIGHT, cppu::UnoType<sal_Int32>::get(), - beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( "DataTableHBorder", + beans::PropertyAttribute::MAYBEVOID ); + 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::MAYBEVOID )); + beans::PropertyAttribute::MAYBEVOID ); } struct StaticDiagramDefaults_Initializer diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 3f27b0d1b0fd..b58aed382112 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -45,12 +45,11 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "Show", + rOutProperties.emplace_back( "Show", PROP_GRID_SHOW, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticGridDefaults_Initializer diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index a26334d77ebe..baf811286a7e 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -60,46 +60,40 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "AnchorPosition", + rOutProperties.emplace_back( "AnchorPosition", PROP_LEGEND_ANCHOR_POSITION, cppu::UnoType<chart2::LegendPosition>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "Expansion", + rOutProperties.emplace_back( "Expansion", PROP_LEGEND_EXPANSION, cppu::UnoType<css::chart::ChartLegendExpansion>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "Show", + rOutProperties.emplace_back( "Show", PROP_LEGEND_SHOW, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "ReferencePageSize", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "ReferencePageSize", PROP_LEGEND_REF_PAGE_SIZE, cppu::UnoType<awt::Size>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "RelativePosition", + rOutProperties.emplace_back( "RelativePosition", PROP_LEGEND_REL_POS, cppu::UnoType<chart2::RelativePosition>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "RelativeSize", + rOutProperties.emplace_back( "RelativeSize", PROP_LEGEND_REL_SIZE, cppu::UnoType<chart2::RelativeSize>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index d1f052418173..2504de8c2555 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -68,89 +68,77 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "ParaAdjust", + rOutProperties.emplace_back( "ParaAdjust", PROP_TITLE_PARA_ADJUST, cppu::UnoType<css::style::ParagraphAdjust>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ParaLastLineAdjust", + rOutProperties.emplace_back( "ParaLastLineAdjust", PROP_TITLE_PARA_LAST_LINE_ADJUST, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ParaLeftMargin", + rOutProperties.emplace_back( "ParaLeftMargin", PROP_TITLE_PARA_LEFT_MARGIN, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ParaRightMargin", + rOutProperties.emplace_back( "ParaRightMargin", PROP_TITLE_PARA_RIGHT_MARGIN, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ParaTopMargin", + rOutProperties.emplace_back( "ParaTopMargin", PROP_TITLE_PARA_TOP_MARGIN, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ParaBottomMargin", + rOutProperties.emplace_back( "ParaBottomMargin", PROP_TITLE_PARA_BOTTOM_MARGIN, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ParaIsHyphenation", + rOutProperties.emplace_back( "ParaIsHyphenation", PROP_TITLE_PARA_IS_HYPHENATION, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "Visible", + rOutProperties.emplace_back( "Visible", PROP_TITLE_VISIBLE, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "TextRotation", + rOutProperties.emplace_back( "TextRotation", PROP_TITLE_TEXT_ROTATION, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "StackCharacters", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "StackCharacters", PROP_TITLE_TEXT_STACKED, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "RelativePosition", + rOutProperties.emplace_back( "RelativePosition", PROP_TITLE_REL_POS, cppu::UnoType<chart2::RelativePosition>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "ReferencePageSize", + rOutProperties.emplace_back( "ReferencePageSize", PROP_TITLE_REF_PAGE_SIZE, cppu::UnoType<awt::Size>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); } struct StaticTitleDefaults_Initializer diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 188a7925928c..270aa96f79f4 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -45,12 +45,11 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "Dimension", + rOutProperties.emplace_back( "Dimension", PROP_AREA_TEMPLATE_DIMENSION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticAreaChartTypeTemplateDefaults_Initializer diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index cf176a1e153e..714473803c18 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -47,18 +47,16 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "Dimension", + rOutProperties.emplace_back( "Dimension", PROP_BAR_TEMPLATE_DIMENSION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "Geometry3D", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "Geometry3D", PROP_BAR_TEMPLATE_GEOMETRY3D, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticBarChartTypeTemplateDefaults_Initializer diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 99f3de05a8e3..393ca6fd8ac1 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -47,38 +47,33 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "Japanese", + rOutProperties.emplace_back( "Japanese", PROP_CANDLESTICKCHARTTYPE_JAPANESE, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "WhiteDay", + rOutProperties.emplace_back( "WhiteDay", PROP_CANDLESTICKCHARTTYPE_WHITE_DAY, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( "BlackDay", + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "BlackDay", PROP_CANDLESTICKCHARTTYPE_BLACK_DAY, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "ShowFirst", + rOutProperties.emplace_back( "ShowFirst", PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "ShowHighLow", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "ShowHighLow", PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticCandleStickChartTypeDefaults_Initializer @@ -225,17 +220,17 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo std::vector< OUString > aMandRoles; - aMandRoles.push_back( "label"); + aMandRoles.emplace_back("label"); if( bShowFirst ) - aMandRoles.push_back( "values-first"); + aMandRoles.emplace_back("values-first"); if( bShowHiLow ) { - aMandRoles.push_back( "values-min"); - aMandRoles.push_back( "values-max"); + aMandRoles.emplace_back("values-min"); + aMandRoles.emplace_back("values-max"); } - aMandRoles.push_back( "values-last"); + aMandRoles.emplace_back("values-last"); return comphelper::containerToSequence( aMandRoles ); } @@ -250,12 +245,12 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() std::vector< OUString > aOptRoles; if( ! bShowFirst ) - aOptRoles.push_back( "values-first"); + aOptRoles.emplace_back("values-first"); if( ! bShowHiLow ) { - aOptRoles.push_back( "values-min"); - aOptRoles.push_back( "values-max"); + aOptRoles.emplace_back("values-min"); + aOptRoles.emplace_back("values-max"); } return comphelper::containerToSequence( aOptRoles ); diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index b04fd86b299f..af99026027bc 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -40,19 +40,17 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "OverlapSequence", + rOutProperties.emplace_back( "OverlapSequence", PROP_BARCHARTTYPE_OVERLAP_SEQUENCE, cppu::UnoType<Sequence< sal_Int32 >>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "GapwidthSequence", + rOutProperties.emplace_back( "GapwidthSequence", PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, cppu::UnoType<Sequence< sal_Int32 >>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticColumnChartTypeDefaults_Initializer diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index f6dd85178eec..68a9db527807 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -50,12 +50,11 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "NumberOfLines", + rOutProperties.emplace_back( "NumberOfLines", PROP_COL_LINE_NUMBER_OF_LINES, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticColumnLineChartTypeTemplateDefaults_Initializer diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index 58b3fb2686e3..eaa1a12dc8dc 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -45,25 +45,22 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_STYLE, + rOutProperties.emplace_back( CHART_UNONAME_CURVE_STYLE, PROP_LINECHARTTYPE_CURVE_STYLE, cppu::UnoType<chart2::CurveStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_RESOLUTION, + rOutProperties.emplace_back( CHART_UNONAME_CURVE_RESOLUTION, PROP_LINECHARTTYPE_CURVE_RESOLUTION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_SPLINE_ORDER, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_SPLINE_ORDER, PROP_LINECHARTTYPE_SPLINE_ORDER, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticLineChartTypeDefaults_Initializer diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index a06f74466003..cf1238edb373 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -52,24 +52,21 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_STYLE, + rOutProperties.emplace_back( CHART_UNONAME_CURVE_STYLE, PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, cppu::UnoType<chart2::CurveStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_RESOLUTION, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_CURVE_RESOLUTION, PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_SPLINE_ORDER, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_SPLINE_ORDER, PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticLineChartTypeTemplateDefaults_Initializer diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 2645b2f0f285..268334460bdd 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -46,17 +46,15 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "UseRings", + rOutProperties.emplace_back( "UseRings", PROP_PIECHARTTYPE_USE_RINGS, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "3DRelativeHeight", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "3DRelativeHeight", PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, cppu::UnoType<sal_Int32>::get(), - beans::PropertyAttribute::MAYBEVOID )); + beans::PropertyAttribute::MAYBEVOID ); } struct StaticPieChartTypeDefaults_Initializer diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 9f7c559617db..c8a7663a9056 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -57,30 +57,26 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "OffsetMode", + rOutProperties.emplace_back( "OffsetMode", PROP_PIE_TEMPLATE_OFFSET_MODE, cppu::UnoType<chart2::PieChartOffsetMode>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "DefaultOffset", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "DefaultOffset", PROP_PIE_TEMPLATE_DEFAULT_OFFSET, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "Dimension", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "Dimension", PROP_PIE_TEMPLATE_DIMENSION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "UseRings", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "UseRings", PROP_PIE_TEMPLATE_USE_RINGS, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticPieChartTypeTemplateDefaults_Initializer diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index af78b959f7b4..c99cdf72b918 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -50,25 +50,22 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_STYLE, + rOutProperties.emplace_back( CHART_UNONAME_CURVE_STYLE, PROP_SCATTERCHARTTYPE_CURVE_STYLE, cppu::UnoType<chart2::CurveStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_RESOLUTION, + rOutProperties.emplace_back( CHART_UNONAME_CURVE_RESOLUTION, PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_SPLINE_ORDER, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_SPLINE_ORDER, PROP_SCATTERCHARTTYPE_SPLINE_ORDER, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticScatterChartTypeDefaults_Initializer diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index fe216ea59b9a..cd752f7674fe 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -54,24 +54,21 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_STYLE, + rOutProperties.emplace_back( CHART_UNONAME_CURVE_STYLE, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, cppu::UnoType<chart2::CurveStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_CURVE_RESOLUTION, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_CURVE_RESOLUTION, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( CHART_UNONAME_SPLINE_ORDER, + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( CHART_UNONAME_SPLINE_ORDER, PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticScatterChartTypeTemplateDefaults_Initializer diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index bc29b89ac2b3..c16463223183 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -59,30 +59,26 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "Volume", + rOutProperties.emplace_back( "Volume", PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "Open", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "Open", PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "LowHigh", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "LowHigh", PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "Japanese", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "Japanese", PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } struct StaticStockChartTypeTemplateDefaults_Initializer diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 2ca115e9f5a8..dfc0ea68cef6 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -54,338 +54,292 @@ void CharacterProperties::AddPropertiesToVector( std::vector< Property > & rOutProperties ) { // CharacterProperties - rOutProperties.push_back( - Property( "CharFontName", + rOutProperties.emplace_back( "CharFontName", PROP_CHAR_FONT_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "CharFontStyleName", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "CharFontStyleName", PROP_CHAR_FONT_STYLE_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // CharFontFamily (see awt.FontFamily) - rOutProperties.push_back( - Property( "CharFontFamily", + rOutProperties.emplace_back( "CharFontFamily", PROP_CHAR_FONT_FAMILY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontCharSet (see awt.CharSet) - rOutProperties.push_back( - Property( "CharFontCharSet", + rOutProperties.emplace_back( "CharFontCharSet", PROP_CHAR_FONT_CHAR_SET, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontPitch (see awt.FontPitch) - rOutProperties.push_back( - Property( "CharFontPitch", + rOutProperties.emplace_back( "CharFontPitch", PROP_CHAR_FONT_PITCH, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharColor - rOutProperties.push_back( - Property( "CharColor", + rOutProperties.emplace_back( "CharColor", PROP_CHAR_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharEscapement - rOutProperties.push_back( - Property( "CharEscapement", + rOutProperties.emplace_back( "CharEscapement", PROP_CHAR_ESCAPEMENT, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // CharHeight - rOutProperties.push_back( - Property( "CharHeight", + rOutProperties.emplace_back( "CharHeight", PROP_CHAR_CHAR_HEIGHT, cppu::UnoType<float>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharUnderline (see awt.FontUnderline) - rOutProperties.push_back( - Property( "CharUnderline", + rOutProperties.emplace_back( "CharUnderline", PROP_CHAR_UNDERLINE, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharUnderlineColor - rOutProperties.push_back( - Property( "CharUnderlineColor", + rOutProperties.emplace_back( "CharUnderlineColor", PROP_CHAR_UNDERLINE_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // CharUnderlineHasColor - rOutProperties.push_back( - Property( "CharUnderlineHasColor", + rOutProperties.emplace_back( "CharUnderlineHasColor", PROP_CHAR_UNDERLINE_HAS_COLOR, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharOverline (see awt.FontUnderline) - rOutProperties.push_back( - Property( "CharOverline", + rOutProperties.emplace_back( "CharOverline", PROP_CHAR_OVERLINE, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT ) ); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharOverlineColor - rOutProperties.push_back( - Property( "CharOverlineColor", + rOutProperties.emplace_back( "CharOverlineColor", PROP_CHAR_OVERLINE_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID ) ); + | beans::PropertyAttribute::MAYBEVOID ); // CharOverlineHasColor - rOutProperties.push_back( - Property( "CharOverlineHasColor", + rOutProperties.emplace_back( "CharOverlineHasColor", PROP_CHAR_OVERLINE_HAS_COLOR, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT ) ); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharWeight (see awt.FontWeight) - rOutProperties.push_back( - Property( "CharWeight", + rOutProperties.emplace_back( "CharWeight", PROP_CHAR_WEIGHT, cppu::UnoType<float>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharPosture - rOutProperties.push_back( - Property( "CharPosture", + rOutProperties.emplace_back( "CharPosture", PROP_CHAR_POSTURE, cppu::UnoType<awt::FontSlant>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "CharAutoKerning", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "CharAutoKerning", PROP_CHAR_AUTO_KERNING, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( "CharKerning", + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "CharKerning", PROP_CHAR_KERNING, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // CharEscapementHeight - rOutProperties.push_back( - Property( "CharEscapementHeight", + rOutProperties.emplace_back( "CharEscapementHeight", PROP_CHAR_ESCAPEMENT_HEIGHT, cppu::UnoType<sal_Int8>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // CharStrikeout (see awt.FontStrikeout) - rOutProperties.push_back( - Property( "CharStrikeout", + rOutProperties.emplace_back( "CharStrikeout", PROP_CHAR_STRIKE_OUT, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharWordMode - rOutProperties.push_back( - Property( "CharWordMode", + rOutProperties.emplace_back( "CharWordMode", PROP_CHAR_WORD_MODE, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharLocale - rOutProperties.push_back( - Property( "CharLocale", + rOutProperties.emplace_back( "CharLocale", PROP_CHAR_LOCALE, cppu::UnoType<lang::Locale>::get(), //#i111967# no PropertyChangeEvent is fired on change so far - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); // CharShadowed - rOutProperties.push_back( - Property( "CharShadowed", + rOutProperties.emplace_back( "CharShadowed", PROP_CHAR_SHADOWED, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharContoured - rOutProperties.push_back( - Property( "CharContoured", + rOutProperties.emplace_back( "CharContoured", PROP_CHAR_CONTOURED, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharRelief (see text.FontRelief) - rOutProperties.push_back( - Property( "CharRelief", + rOutProperties.emplace_back( "CharRelief", PROP_CHAR_RELIEF, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharEmphasize (see text.FontEmphasis) - rOutProperties.push_back( - Property( "CharEmphasis", + rOutProperties.emplace_back( "CharEmphasis", PROP_CHAR_EMPHASIS, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharacterPropertiesAsian // CharFontNameAsian - rOutProperties.push_back( - Property( "CharFontNameAsian", + rOutProperties.emplace_back( "CharFontNameAsian", PROP_CHAR_ASIAN_FONT_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontStyleNameAsian - rOutProperties.push_back( - Property( "CharFontStyleNameAsian", + rOutProperties.emplace_back( "CharFontStyleNameAsian", PROP_CHAR_ASIAN_FONT_STYLE_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // CharFontFamilyAsian (see awt.FontFamily) - rOutProperties.push_back( - Property( "CharFontFamilyAsian", + rOutProperties.emplace_back( "CharFontFamilyAsian", PROP_CHAR_ASIAN_FONT_FAMILY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontCharSetAsian (see awt.CharSet) - rOutProperties.push_back( - Property( "CharFontCharSetAsian", + rOutProperties.emplace_back( "CharFontCharSetAsian", PROP_CHAR_ASIAN_CHAR_SET, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontPitchAsian (see awt.FontPitch) - rOutProperties.push_back( - Property( "CharFontPitchAsian", + rOutProperties.emplace_back( "CharFontPitchAsian", PROP_CHAR_ASIAN_FONT_PITCH, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharHeightAsian - rOutProperties.push_back( - Property( "CharHeightAsian", + rOutProperties.emplace_back( "CharHeightAsian", PROP_CHAR_ASIAN_CHAR_HEIGHT, cppu::UnoType<float>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharWeightAsian - rOutProperties.push_back( - Property( "CharWeightAsian", + rOutProperties.emplace_back( "CharWeightAsian", PROP_CHAR_ASIAN_WEIGHT, cppu::UnoType<float>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharPostureAsian - rOutProperties.push_back( - Property( "CharPostureAsian", + rOutProperties.emplace_back( "CharPostureAsian", PROP_CHAR_ASIAN_POSTURE, cppu::UnoType<awt::FontSlant>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharLocaleAsian - rOutProperties.push_back( - Property( "CharLocaleAsian", + rOutProperties.emplace_back( "CharLocaleAsian", PROP_CHAR_ASIAN_LOCALE, cppu::UnoType<lang::Locale>::get(), //#i111967# no PropertyChangeEvent is fired on change so far - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); // CharacterPropertiesComplex // CharFontNameComplex - rOutProperties.push_back( - Property( "CharFontNameComplex", + rOutProperties.emplace_back( "CharFontNameComplex", PROP_CHAR_COMPLEX_FONT_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontStyleNameComplex - rOutProperties.push_back( - Property( "CharFontStyleNameComplex", + rOutProperties.emplace_back( "CharFontStyleNameComplex", PROP_CHAR_COMPLEX_FONT_STYLE_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // CharFontFamilyComplex (see awt.FontFamily) - rOutProperties.push_back( - Property( "CharFontFamilyComplex", + rOutProperties.emplace_back( "CharFontFamilyComplex", PROP_CHAR_COMPLEX_FONT_FAMILY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontCharSetComplex (see awt.CharSet) - rOutProperties.push_back( - Property( "CharFontCharSetComplex", + rOutProperties.emplace_back( "CharFontCharSetComplex", PROP_CHAR_COMPLEX_CHAR_SET, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharFontPitchComplex (see awt.FontPitch) - rOutProperties.push_back( - Property( "CharFontPitchComplex", + rOutProperties.emplace_back( "CharFontPitchComplex", PROP_CHAR_COMPLEX_FONT_PITCH, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharHeightComplex - rOutProperties.push_back( - Property( "CharHeightComplex", + rOutProperties.emplace_back( "CharHeightComplex", PROP_CHAR_COMPLEX_CHAR_HEIGHT, cppu::UnoType<float>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharWeightComplex - rOutProperties.push_back( - Property( "CharWeightComplex", + rOutProperties.emplace_back( "CharWeightComplex", PROP_CHAR_COMPLEX_WEIGHT, cppu::UnoType<float>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharPostureComplex - rOutProperties.push_back( - Property( "CharPostureComplex", + rOutProperties.emplace_back( "CharPostureComplex", PROP_CHAR_COMPLEX_POSTURE, cppu::UnoType<awt::FontSlant>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // CharLocaleComplex - rOutProperties.push_back( - Property( "CharLocaleComplex", + rOutProperties.emplace_back( "CharLocaleComplex", PROP_CHAR_COMPLEX_LOCALE, cppu::UnoType<lang::Locale>::get(), //#i111967# no PropertyChangeEvent is fired on change so far - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); // Writing Mode left to right vs right to left - rOutProperties.push_back( - Property( "WritingMode", + rOutProperties.emplace_back( "WritingMode", PROP_WRITING_MODE, cppu::UnoType<sal_Int16>::get(), /*css::text::WritingMode2*/ beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ParaIsCharacterDistance", + rOutProperties.emplace_back( "ParaIsCharacterDistance", PROP_PARA_IS_CHARACTER_DISTANCE, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } void CharacterProperties::AddDefaultsToMap( diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index a234fae7f653..bb6110bea3e9 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -266,7 +266,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( const OUString& aCurrent = rStrings[nN]; if( bCreateSingleCategories || std::find( rLimitingBorders.begin(), rLimitingBorders.end(), nN ) != rLimitingBorders.end() ) { - aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) ); + aResult.emplace_back(aPrevious,nCurrentCount ); nCurrentCount=1; aPrevious = aCurrent; } @@ -280,14 +280,14 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector( ++nCurrentCount; else { - aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) ); + aResult.emplace_back(aPrevious,nCurrentCount ); nCurrentCount=1; aPrevious = aCurrent; } } } if( nCurrentCount ) - aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) ); + aResult.emplace_back(aPrevious,nCurrentCount ); return aResult; } diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index 27ba6b63d314..86b1767fac00 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -36,141 +36,123 @@ namespace void lcl_AddPropertiesToVector_without_BitmapProperties( std::vector< css::beans::Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "FillStyle", + rOutProperties.emplace_back( "FillStyle", FillProperties::PROP_FILL_STYLE, cppu::UnoType<drawing::FillStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillColor", + rOutProperties.emplace_back( "FillColor", FillProperties::PROP_FILL_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID // "maybe auto" - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillTransparence", + rOutProperties.emplace_back( "FillTransparence", FillProperties::PROP_FILL_TRANSPARENCE, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillTransparenceGradientName", + rOutProperties.emplace_back( "FillTransparenceGradientName", FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillGradientName", + rOutProperties.emplace_back( "FillGradientName", FillProperties::PROP_FILL_GRADIENT_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - beans::Property( "FillGradientStepCount", + rOutProperties.emplace_back( "FillGradientStepCount", FillProperties::PROP_FILL_GRADIENT_STEPCOUNT, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "FillHatchName", + rOutProperties.emplace_back( "FillHatchName", FillProperties::PROP_FILL_HATCH_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); //bitmap properties see lcl_AddPropertiesToVector_only_BitmapProperties() - rOutProperties.push_back( - Property( "FillBackground", + rOutProperties.emplace_back( "FillBackground", FillProperties::PROP_FILL_BACKGROUND, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } void lcl_AddPropertiesToVector_only_BitmapProperties( std::vector< css::beans::Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "FillBitmapName", + rOutProperties.emplace_back( "FillBitmapName", FillProperties::PROP_FILL_BITMAP_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapOffsetX", + rOutProperties.emplace_back( "FillBitmapOffsetX", FillProperties::PROP_FILL_BITMAP_OFFSETX, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapOffsetY", + rOutProperties.emplace_back( "FillBitmapOffsetY", FillProperties::PROP_FILL_BITMAP_OFFSETY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapPositionOffsetX", + rOutProperties.emplace_back( "FillBitmapPositionOffsetX", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETX, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapPositionOffsetY", + rOutProperties.emplace_back( "FillBitmapPositionOffsetY", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETY, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapRectanglePoint", + rOutProperties.emplace_back( "FillBitmapRectanglePoint", FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT, cppu::UnoType<drawing::RectanglePoint>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapLogicalSize", + rOutProperties.emplace_back( "FillBitmapLogicalSize", FillProperties::PROP_FILL_BITMAP_LOGICALSIZE, cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapSizeX", + rOutProperties.emplace_back( "FillBitmapSizeX", FillProperties::PROP_FILL_BITMAP_SIZEX, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapSizeY", + rOutProperties.emplace_back( "FillBitmapSizeY", FillProperties::PROP_FILL_BITMAP_SIZEY, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "FillBitmapMode", + rOutProperties.emplace_back( "FillBitmapMode", FillProperties::PROP_FILL_BITMAP_MODE, cppu::UnoType<drawing::BitmapMode>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } void lcl_AddDefaultsToMap_without_BitmapProperties( diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx index bba5d22695c5..6e78e45c7db6 100644 --- a/chart2/source/tools/LinePropertiesHelper.cxx +++ b/chart2/source/tools/LinePropertiesHelper.cxx @@ -35,56 +35,49 @@ void LinePropertiesHelper::AddPropertiesToVector( std::vector< Property > & rOutProperties ) { // Line Properties see service drawing::LineProperties - rOutProperties.push_back( - Property( "LineStyle", + rOutProperties.emplace_back( "LineStyle", PROP_LINE_STYLE, cppu::UnoType<drawing::LineStyle>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "LineDash", + rOutProperties.emplace_back( "LineDash", PROP_LINE_DASH, cppu::UnoType<drawing::LineDash>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); //not in service description - rOutProperties.push_back( - Property( "LineDashName", + rOutProperties.emplace_back( "LineDashName", PROP_LINE_DASH_NAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "LineColor", + rOutProperties.emplace_back( "LineColor", PROP_LINE_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "LineTransparence", + rOutProperties.emplace_back( "LineTransparence", PROP_LINE_TRANSPARENCE, cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "LineWidth", + rOutProperties.emplace_back( "LineWidth", PROP_LINE_WIDTH, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "LineJoint", + rOutProperties.emplace_back( "LineJoint", PROP_LINE_JOINT, cppu::UnoType<drawing::LineJoint>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } void LinePropertiesHelper::AddDefaultsToMap( diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 79a377441253..048fb99ccf9b 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -109,7 +109,7 @@ void ModifyEventForwarder::AddListener( const Reference< util::XModifyListener > // remember the helper class for later remove uno::WeakReference< util::XModifyListener > xWeakRef( aListener ); xListenerToAdd.set( new WeakModifyListenerAdapter( xWeakRef )); - m_aListenerMap.push_back( tListenerMap::value_type( xWeakRef, xListenerToAdd )); + m_aListenerMap.emplace_back( xWeakRef, xListenerToAdd ); } m_aModifyListeners.addListener( cppu::UnoType<decltype(xListenerToAdd)>::get(), xListenerToAdd ); diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 203037658cd8..09d8485e59c7 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -274,21 +274,19 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface Reference< chart2::data::XDataSequence > xValues( aLSeqSeq[i]->getValues()); if( xLabel.is()) - aHilightedRanges.push_back( - chart2::data::HighlightedRange( + aHilightedRanges.emplace_back( xLabel->getSourceRangeRepresentation(), -1, nPreferredColor, - false )); + false ); sal_Int32 nUnhiddenIndex = DataSeriesHelper::translateIndexFromHiddenToFullSequence( nIndex, xValues, !m_bIncludeHiddenCells ); if( xValues.is()) - aHilightedRanges.push_back( - chart2::data::HighlightedRange( + aHilightedRanges.emplace_back( xValues->getSourceRangeRepresentation(), nUnhiddenIndex, nPreferredColor, - false )); + false ); } m_aSelectedRanges = comphelper::containerToSequence( aHilightedRanges ); } diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index e90296fc4227..73a205e1e8a6 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -68,53 +68,46 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "PolynomialDegree", + rOutProperties.emplace_back( "PolynomialDegree", PROPERTY_DEGREE, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "MovingAveragePeriod", + rOutProperties.emplace_back( "MovingAveragePeriod", PROPERTY_PERIOD, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ExtrapolateForward", + rOutProperties.emplace_back( "ExtrapolateForward", PROPERTY_EXTRAPOLATE_FORWARD, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND | - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ExtrapolateBackward", + rOutProperties.emplace_back( "ExtrapolateBackward", PROPERTY_EXTRAPOLATE_BACKWARD, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND | - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ForceIntercept", + rOutProperties.emplace_back( "ForceIntercept", PROPERTY_FORCE_INTERCEPT, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "InterceptValue", + rOutProperties.emplace_back( "InterceptValue", PROPERTY_INTERCEPT_VALUE, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND | - beans::PropertyAttribute::MAYBEDEFAULT )); + beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "CurveName", + rOutProperties.emplace_back( "CurveName", PROPERTY_CURVE_NAME, cppu::UnoType<OUString>::get(), - beans::PropertyAttribute::BOUND )); + beans::PropertyAttribute::BOUND ); } struct StaticXXXDefaults_Initializer diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index d72298fee60e..94bf53a6e3d6 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -60,54 +60,47 @@ enum void lcl_AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "ShowEquation", + rOutProperties.emplace_back( "ShowEquation", PROP_EQUATION_SHOW, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "XName", + rOutProperties.emplace_back( "XName", PROP_EQUATION_XNAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "YName", + rOutProperties.emplace_back( "YName", PROP_EQUATION_YNAME, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ShowCorrelationCoefficient", + rOutProperties.emplace_back( "ShowCorrelationCoefficient", PROP_EQUATION_SHOW_CORRELATION_COEFF, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); - rOutProperties.push_back( - Property( "ReferencePageSize", + rOutProperties.emplace_back( "ReferencePageSize", PROP_EQUATION_REF_PAGE_SIZE, cppu::UnoType<awt::Size>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( "RelativePosition", + rOutProperties.emplace_back( "RelativePosition", PROP_EQUATION_REL_POS, cppu::UnoType<chart2::RelativePosition>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); - rOutProperties.push_back( - Property( CHART_UNONAME_NUMFMT, + rOutProperties.emplace_back( CHART_UNONAME_NUMFMT, PROP_EQUATION_NUMBER_FORMAT, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); } struct StaticRegressionEquationDefaults_Initializer diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx index 8c191dd18719..4336b162b2f6 100644 --- a/chart2/source/tools/RelativeSizeHelper.cxx +++ b/chart2/source/tools/RelativeSizeHelper.cxx @@ -60,9 +60,9 @@ void RelativeSizeHelper::adaptFontSizes( float fFontHeight = 0; vector< OUString > aProperties; - aProperties.push_back( "CharHeight" ); - aProperties.push_back( "CharHeightAsian" ); - aProperties.push_back( "CharHeightComplex" ); + aProperties.emplace_back("CharHeight" ); + aProperties.emplace_back("CharHeightAsian" ); + aProperties.emplace_back("CharHeightComplex" ); for( vector< OUString >::const_iterator aIt = aProperties.begin(); aIt != aProperties.end(); ++aIt ) diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index dfe44a0bbc69..2f0f82f94395 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -39,263 +39,230 @@ void SceneProperties::AddPropertiesToVector( std::vector< Property > & rOutProperties ) { // transformation matrix - rOutProperties.push_back( - Property( "D3DTransformMatrix", + rOutProperties.emplace_back( "D3DTransformMatrix", PROP_SCENE_TRANSF_MATRIX, cppu::UnoType<drawing::HomogenMatrix>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // distance: deprecated ( this is not used by the chart view; it's only here for compatibility with old chart ) - rOutProperties.push_back( - Property( "D3DSceneDistance", + rOutProperties.emplace_back( "D3DSceneDistance", PROP_SCENE_DISTANCE, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // focalLength: deprecated ( this is not used by the chart view; it's only here for compatibility with old chart ) - rOutProperties.push_back( - Property( "D3DSceneFocalLength", + rOutProperties.emplace_back( "D3DSceneFocalLength", PROP_SCENE_FOCAL_LENGTH, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // shadowSlant - rOutProperties.push_back( - Property( "D3DSceneShadowSlant", + rOutProperties.emplace_back( "D3DSceneShadowSlant", PROP_SCENE_SHADOW_SLANT, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // shadeMode - rOutProperties.push_back( - Property( "D3DSceneShadeMode", + rOutProperties.emplace_back( "D3DSceneShadeMode", PROP_SCENE_SHADE_MODE, cppu::UnoType<drawing::ShadeMode>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // ambientColor - rOutProperties.push_back( - Property( "D3DSceneAmbientColor", + rOutProperties.emplace_back( "D3DSceneAmbientColor", PROP_SCENE_AMBIENT_COLOR, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // lightingMode - rOutProperties.push_back( - Property( "D3DSceneTwoSidedLighting", + rOutProperties.emplace_back( "D3DSceneTwoSidedLighting", PROP_SCENE_TWO_SIDED_LIGHTING, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // camera geometry - rOutProperties.push_back( - Property( "D3DCameraGeometry", + rOutProperties.emplace_back( "D3DCameraGeometry", PROP_SCENE_CAMERA_GEOMETRY, cppu::UnoType<drawing::CameraGeometry>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // perspective - rOutProperties.push_back( - Property( "D3DScenePerspective", + rOutProperties.emplace_back( "D3DScenePerspective", PROP_SCENE_PERSPECTIVE, cppu::UnoType<drawing::ProjectionMode>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // Light Sources // light source 1 - rOutProperties.push_back( - Property( "D3DSceneLightColor1", + rOutProperties.emplace_back( "D3DSceneLightColor1", PROP_SCENE_LIGHT_COLOR_1, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection1", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection1", PROP_SCENE_LIGHT_DIRECTION_1, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn1", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn1", PROP_SCENE_LIGHT_ON_1, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // light source 2 - rOutProperties.push_back( - Property( "D3DSceneLightColor2", + rOutProperties.emplace_back( "D3DSceneLightColor2", PROP_SCENE_LIGHT_COLOR_2, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection2", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection2", PROP_SCENE_LIGHT_DIRECTION_2, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn2", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn2", PROP_SCENE_LIGHT_ON_2, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // light source 3 - rOutProperties.push_back( - Property( "D3DSceneLightColor3", + rOutProperties.emplace_back( "D3DSceneLightColor3", PROP_SCENE_LIGHT_COLOR_3, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection3", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection3", PROP_SCENE_LIGHT_DIRECTION_3, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn3", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn3", PROP_SCENE_LIGHT_ON_3, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // light source 4 - rOutProperties.push_back( - Property( "D3DSceneLightColor4", + rOutProperties.emplace_back( "D3DSceneLightColor4", PROP_SCENE_LIGHT_COLOR_4, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection4", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection4", PROP_SCENE_LIGHT_DIRECTION_4, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn4", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn4", PROP_SCENE_LIGHT_ON_4, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // light source 5 - rOutProperties.push_back( - Property( "D3DSceneLightColor5", + rOutProperties.emplace_back( "D3DSceneLightColor5", PROP_SCENE_LIGHT_COLOR_5, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection5", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection5", PROP_SCENE_LIGHT_DIRECTION_5, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn5", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn5", PROP_SCENE_LIGHT_ON_5, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // light source 6 - rOutProperties.push_back( - Property( "D3DSceneLightColor6", + rOutProperties.emplace_back( "D3DSceneLightColor6", PROP_SCENE_LIGHT_COLOR_6, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection6", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection6", PROP_SCENE_LIGHT_DIRECTION_6, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn6", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn6", PROP_SCENE_LIGHT_ON_6, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // light source 7 - rOutProperties.push_back( - Property( "D3DSceneLightColor7", + rOutProperties.emplace_back( "D3DSceneLightColor7", PROP_SCENE_LIGHT_COLOR_7, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection7", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection7", PROP_SCENE_LIGHT_DIRECTION_7, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn7", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn7", PROP_SCENE_LIGHT_ON_7, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); // light source 8 - rOutProperties.push_back( - Property( "D3DSceneLightColor8", + rOutProperties.emplace_back( "D3DSceneLightColor8", PROP_SCENE_LIGHT_COLOR_8, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightDirection8", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightDirection8", PROP_SCENE_LIGHT_DIRECTION_8, cppu::UnoType<drawing::Direction3D>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); - rOutProperties.push_back( - Property( "D3DSceneLightOn8", + | beans::PropertyAttribute::MAYBEDEFAULT ); + rOutProperties.emplace_back( "D3DSceneLightOn8", PROP_SCENE_LIGHT_ON_8, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID - | beans::PropertyAttribute::MAYBEDEFAULT )); + | beans::PropertyAttribute::MAYBEDEFAULT ); } void SceneProperties::AddDefaultsToMap( diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 730b4fc46298..d8ce1a056a43 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -32,31 +32,27 @@ namespace chart void UserDefinedProperties::AddPropertiesToVector( std::vector< Property > & rOutProperties ) { - rOutProperties.push_back( - Property( "ChartUserDefinedAttributes", + rOutProperties.emplace_back( "ChartUserDefinedAttributes", PROP_XML_USERDEF_CHART, cppu::UnoType<container::XNameContainer>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( "TextUserDefinedAttributes", + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "TextUserDefinedAttributes", PROP_XML_USERDEF_TEXT, cppu::UnoType<container::XNameContainer>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); - rOutProperties.push_back( - Property( "ParaUserDefinedAttributes", + | beans::PropertyAttribute::MAYBEVOID ); + rOutProperties.emplace_back( "ParaUserDefinedAttributes", PROP_XML_USERDEF_PARA, cppu::UnoType<container::XNameContainer>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); // UserDefinedAttributesSupplier - rOutProperties.push_back( - Property( "UserDefinedAttributes", + rOutProperties.emplace_back( "UserDefinedAttributes", PROP_XML_USERDEF, cppu::UnoType<container::XNameContainer>::get(), beans::PropertyAttribute::BOUND - | beans::PropertyAttribute::MAYBEVOID )); + | beans::PropertyAttribute::MAYBEVOID ); } } // namespace chart diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 0ed27ee808b3..acb7553a4a19 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -205,7 +205,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 { //new z slot std::vector< VDataSeriesGroup > aZSlot; - aZSlot.push_back( VDataSeriesGroup(pSeries) ); + aZSlot.emplace_back(pSeries ); m_aZSlots.push_back( aZSlot ); } else @@ -216,7 +216,7 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32 if(xSlot<0 || xSlot>=static_cast<sal_Int32>(rXSlots.size())) { //append the series to already existing x series - rXSlots.push_back( VDataSeriesGroup(pSeries) ); + rXSlots.emplace_back(pSeries ); } else { diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 5ab1f6b73d44..908e9fe76e12 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -1810,10 +1810,10 @@ void OpenGL3DRenderer::CreateTextTextureBatch(const boost::shared_array<sal_uInt long bmpHeight = rSizePixels.Height(); glm::vec4 id = getColorAsVector(nUniqueId); m_TextInfoBatch.idList.push_back(id); - m_TextInfoBatch.vertexList.push_back(glm::vec3(vBottomRight.x, vBottomRight.y, vBottomRight.z)); - m_TextInfoBatch.vertexList.push_back(glm::vec3(vTopRight.x, vTopRight.y, vTopRight.z)); - m_TextInfoBatch.vertexList.push_back(glm::vec3(vTopLeft.x, vTopLeft.y, vTopLeft.z)); - m_TextInfoBatch.vertexList.push_back(glm::vec3(vBottomLeft.x, vBottomLeft.y, vBottomLeft.z)); + m_TextInfoBatch.vertexList.emplace_back(vBottomRight.x, vBottomRight.y, vBottomRight.z); + m_TextInfoBatch.vertexList.emplace_back(vTopRight.x, vTopRight.y, vTopRight.z); + m_TextInfoBatch.vertexList.emplace_back(vTopLeft.x, vTopLeft.y, vTopLeft.z); + m_TextInfoBatch.vertexList.emplace_back(vBottomLeft.x, vBottomLeft.y, vBottomLeft.z); //find the last vector, which size is small than default batch number; size_t index = 0; while ((m_TextInfoBatch.texture.size() > 0) && @@ -1852,18 +1852,18 @@ void OpenGL3DRenderer::CreateTextTextureBatch(const boost::shared_array<sal_uInt glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, m_TextInfoBatch.texture[index].subTextureNum, bmpWidth, bmpHeight, 1, GL_RGB, GL_UNSIGNED_BYTE, bitmapBuf.get()); CHECK_GL_ERROR(); //calc texture coordinate - m_TextInfoBatch.textureCoordList.push_back(glm::vec3((float)bmpWidth / (float)m_TextInfoBatch.texture[index].textureArrayWidth, + m_TextInfoBatch.textureCoordList.emplace_back((float)bmpWidth / (float)m_TextInfoBatch.texture[index].textureArrayWidth, 0, - m_TextInfoBatch.texture[index].subTextureNum)); - m_TextInfoBatch.textureCoordList.push_back(glm::vec3((float)bmpWidth / (float)m_TextInfoBatch.texture[index].textureArrayWidth, + m_TextInfoBatch.texture[index].subTextureNum); + m_TextInfoBatch.textureCoordList.emplace_back((float)bmpWidth / (float)m_TextInfoBatch.texture[index].textureArrayWidth, (float)bmpHeight/ (float)m_TextInfoBatch.texture[index].textureArrayHeight, - m_TextInfoBatch.texture[index].subTextureNum)); - m_TextInfoBatch.textureCoordList.push_back(glm::vec3(0, + m_TextInfoBatch.texture[index].subTextureNum); + m_TextInfoBatch.textureCoordList.emplace_back(0, (float)bmpHeight/ (float)m_TextInfoBatch.texture[index].textureArrayHeight, - m_TextInfoBatch.texture[index].subTextureNum)); - m_TextInfoBatch.textureCoordList.push_back(glm::vec3(0, + m_TextInfoBatch.texture[index].subTextureNum); + m_TextInfoBatch.textureCoordList.emplace_back(0, 0, - m_TextInfoBatch.texture[index].subTextureNum)); + m_TextInfoBatch.texture[index].subTextureNum); m_TextInfoBatch.texture[index].subTextureNum++; glBindTexture(GL_TEXTURE_2D_ARRAY, 0); } diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index b399de19147e..af644af1538f 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -246,7 +246,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile) s = av[i] + 2; } - m_extra_input_files.push_back( s ); + m_extra_input_files.emplace_back(s ); break; } @@ -286,7 +286,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile) } else { - m_inputFiles.push_back(av[i]); + m_inputFiles.emplace_back(av[i]); } } } diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index 08c5a7f4dbf8..19818f8143be 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -177,7 +177,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile) s = av[i] + 2; } - m_extra_input_files.push_back( s ); + m_extra_input_files.emplace_back(s ); break; } @@ -215,7 +215,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile) } } else { - m_inputFiles.push_back(av[i]); + m_inputFiles.emplace_back(av[i]); } } } diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index f2ce8454ef26..8ca5b7190ca2 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -786,7 +786,7 @@ void handleEnumType( std::unique_ptr< ClassFile::Code > blockCode(cf->newCode()); blockCode->instrGetstatic(className, pair.second, classDescriptor); blockCode->instrAreturn(); - blocks.push_back(std::make_pair(pair.first, blockCode.get())); + blocks.emplace_back(pair.first, blockCode.get()); blockCode.release(); } code->instrLookupswitch(defCode.get(), blocks); @@ -1908,13 +1908,12 @@ void handleInterfaceType( "set" + attrName, sdesc.getDescriptor(), nullptr, exc2, sdesc.getSignature()); } - typeInfo.push_back( - TypeInfo( + typeInfo.emplace_back( TypeInfo::KIND_ATTRIBUTE, attrName, specialType, static_cast< TypeInfo::Flags >( (attr.readOnly ? TypeInfo::FLAG_READONLY : 0) | (attr.bound ? TypeInfo::FLAG_BOUND : 0)), - index, polymorphicUnoType)); + index, polymorphicUnoType); index += (attr.readOnly ? 1 : 2); } for (const unoidl::InterfaceTypeEntity::Method& method : entity->getDirectMethods()) @@ -1925,11 +1924,10 @@ void handleInterfaceType( MethodDescriptor desc( manager, dependencies, method.returnType, &specialReturnType, &polymorphicUnoReturnType); - typeInfo.push_back( - TypeInfo( + typeInfo.emplace_back( TypeInfo::KIND_METHOD, methodName, specialReturnType, static_cast< TypeInfo::Flags >(0), index++, - polymorphicUnoReturnType)); + polymorphicUnoReturnType); sal_Int32 paramIndex = 0; for (const unoidl::InterfaceTypeEntity::Method::Parameter& param : method.parameters) { @@ -1943,10 +1941,9 @@ void handleInterfaceType( if (out || isSpecialType(specialType) || polymorphicUnoType.kind != PolymorphicUnoType::KIND_NONE) { - typeInfo.push_back( - TypeInfo( + typeInfo.emplace_back( codemaker::convertString(param.name), specialType, in, - out, methodName, paramIndex, polymorphicUnoType)); + out, methodName, paramIndex, polymorphicUnoType); } ++paramIndex; } diff --git a/comphelper/source/container/interfacecontainer2.cxx b/comphelper/source/container/interfacecontainer2.cxx index 90f4e01b476e..678ba70083f8 100644 --- a/comphelper/source/container/interfacecontainer2.cxx +++ b/comphelper/source/container/interfacecontainer2.cxx @@ -149,7 +149,7 @@ std::vector< Reference<XInterface> > OInterfaceContainerHelper2::getElements() c rVec = *aData.pAsVector; else if( aData.pAsInterface ) { - rVec.push_back( Reference<XInterface>( aData.pAsInterface ) ); + rVec.emplace_back( aData.pAsInterface ); } return rVec; } diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 88489ec65e3a..ec305e4bdfce 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -124,7 +124,7 @@ namespace comphelper ::osl::MutexGuard aGuard( m_xImpl->aMutex ); // remember this event - m_xImpl->aEvents.push_back( ProcessableEvent( _rEvent, _xProcessor ) ); + m_xImpl->aEvents.emplace_back( _rEvent, _xProcessor ); // awake the thread m_xImpl->aPendingActions.set(); diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index abc8579a542b..a6a4e5ec9e8e 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -608,7 +608,7 @@ namespace if (xPackage.is()) { - maEntries.push_back(ExtensionInfoEntry(xPackage)); + maEntries.emplace_back(xPackage); } } } @@ -642,10 +642,9 @@ namespace } const bool bEnabled(aAttrRevoked.isEmpty() || !aAttrRevoked.toBoolean()); - maEntries.push_back( - ExtensionInfoEntry( + maEntries.emplace_back( OUStringToOString(aAttrUrl, RTL_TEXTENCODING_ASCII_US), - bEnabled)); + bEnabled); } } else @@ -1607,12 +1606,11 @@ namespace // create a file entry for a new file. Offset is set automatically // to 0 to mark the entry as new file entry - maPackedFileEntryVector.push_back( - PackedFileEntry( + maPackedFileEntryVector.emplace_back( static_cast< sal_uInt32 >(nFileSize), nCrc32, rFileCandidate, - bCompress)); + bCompress); mbChanged = true; } @@ -2066,12 +2064,12 @@ namespace comphelper if (aDirNames.empty()) { - aDirNames.push_back("config"); // UI config stuff - aDirNames.push_back("registry"); // most of the registry stuff - aDirNames.push_back("psprint"); // not really needed, can be abandoned - aDirNames.push_back("store"); // not really needed, can be abandoned - aDirNames.push_back("temp"); // not really needed, can be abandoned - aDirNames.push_back("pack"); // own backup dir + aDirNames.emplace_back("config"); // UI config stuff + aDirNames.emplace_back("registry"); // most of the registry stuff + aDirNames.emplace_back("psprint"); // not really needed, can be abandoned + aDirNames.emplace_back("store"); // not really needed, can be abandoned + aDirNames.emplace_back("temp"); // not really needed, can be abandoned + aDirNames.emplace_back("pack"); // own backup dir } return aDirNames; @@ -2083,7 +2081,7 @@ namespace comphelper if (aFileNames.empty()) { - aFileNames.push_back("registrymodifications.xcu"); // personal registry stuff + aFileNames.emplace_back("registrymodifications.xcu"); // personal registry stuff } return aFileNames; diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index f15651f0db0b..59e3248f8b6b 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -43,14 +43,14 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons // set root path aParam.Name = "nodepath"; aParam.Value <<= sPackage; - lParams.push_back(css::uno::Any(aParam)); + lParams.emplace_back(aParam); // enable all locales mode if (eMode & EConfigurationModes::AllLocales) { aParam.Name = "locale"; aParam.Value <<= OUString("*"); - lParams.push_back(css::uno::Any(aParam)); + lParams.emplace_back(aParam); } // open it diff --git a/comphelper/source/misc/profilezone.cxx b/comphelper/source/misc/profilezone.cxx index 44a1be0f44a8..f2e1c07b061f 100644 --- a/comphelper/source/misc/profilezone.cxx +++ b/comphelper/source/misc/profilezone.cxx @@ -49,8 +49,7 @@ long long addRecording(const char * aProfileId, long long aCreateTime) if (!aProfileId) aProfileId = "(null)"; OUString aString(aProfileId, strlen(aProfileId), RTL_TEXTENCODING_UTF8); - g_aRecording.push_back( - OUString::number(osl_getThreadIdentifier(nullptr)) + " " + + g_aRecording.emplace_back(OUString::number(osl_getThreadIdentifier(nullptr)) + " " + OUString::number(aTime/1000000.0) + " " + aString + ": " + (aCreateTime == 0 ? OUString("start") : OUString("stop")) + (aCreateTime != 0 ? (" " + OUString::number((aTime - aCreateTime)/1000.0) + " ms") : OUString("")) diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 787c3fefcb39..063587401434 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -118,8 +118,8 @@ uno::Sequence<OUString> ServiceDecl::getSupportedServiceNames() const sal_Int32 nIndex = 0; do { OString const token( str.getToken( 0, cDelim, nIndex ) ); - vec.push_back( OUString( token.getStr(), token.getLength(), - RTL_TEXTENCODING_ASCII_US ) ); + vec.emplace_back( token.getStr(), token.getLength(), + RTL_TEXTENCODING_ASCII_US ); } while (nIndex >= 0); diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 3eafb4bd9391..0557a3f95b4a 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -680,9 +680,8 @@ void SyntaxHighlighter::Tokenizer::getHighlightPortions(const OUString& rLine, // Loop over all the tokens while( getNextToken( pos, eType, pStartPos, pEndPos ) ) { - portions.push_back( - HighlightPortion( - pStartPos - rLine.getStr(), pEndPos - rLine.getStr(), eType)); + portions.emplace_back( + pStartPos - rLine.getStr(), pEndPos - rLine.getStr(), eType); } } diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index cf02d5c9bbf7..a3a22134220a 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -118,7 +118,7 @@ AttributeList::~AttributeList() void AttributeList::AddAttribute(const OUString &sName, const OUString &sType, const OUString &sValue) { - m_pImpl->vecAttribute.push_back( TagAttribute_Impl(sName, sType, sValue) ); + m_pImpl->vecAttribute.emplace_back(sName, sType, sValue ); } void AttributeList::Clear() diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 0f062b30bdf7..6eb692cc5430 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -249,25 +249,24 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames() osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); std::vector<OUString> services; - services.push_back("com.sun.star.configuration.ConfigurationAccess"); + services.emplace_back("com.sun.star.configuration.ConfigurationAccess"); if (getRootAccess()->isUpdate()) { - services.push_back( - "com.sun.star.configuration.ConfigurationUpdateAccess"); + services.emplace_back("com.sun.star.configuration.ConfigurationUpdateAccess"); } - services.push_back("com.sun.star.configuration.HierarchyAccess"); - services.push_back("com.sun.star.configuration.HierarchyElement"); + services.emplace_back("com.sun.star.configuration.HierarchyAccess"); + services.emplace_back("com.sun.star.configuration.HierarchyElement"); if (getNode()->kind() == Node::KIND_GROUP) { - services.push_back("com.sun.star.configuration.GroupAccess"); - services.push_back("com.sun.star.configuration.PropertyHierarchy"); + services.emplace_back("com.sun.star.configuration.GroupAccess"); + services.emplace_back("com.sun.star.configuration.PropertyHierarchy"); if (getRootAccess()->isUpdate()) { - services.push_back("com.sun.star.configuration.GroupUpdate"); + services.emplace_back("com.sun.star.configuration.GroupUpdate"); } } else { - services.push_back("com.sun.star.configuration.SetAccess"); - services.push_back("com.sun.star.configuration.SimpleSetAccess"); + services.emplace_back("com.sun.star.configuration.SetAccess"); + services.emplace_back("com.sun.star.configuration.SimpleSetAccess"); if (getRootAccess()->isUpdate()) { - services.push_back("com.sun.star.configuration.SetUpdate"); - services.push_back("com.sun.star.configuration.SimpleSetUpdate"); + services.emplace_back("com.sun.star.configuration.SetUpdate"); + services.emplace_back("com.sun.star.configuration.SimpleSetUpdate"); } } addSupportedServiceNames(&services); @@ -1672,11 +1671,10 @@ void Access::initBroadcasterAndChanges( //TODO: non-void Element, ReplacedElement } if (collectPropChanges) { - propChanges.push_back( - css::beans::PropertyChangeEvent( + propChanges.emplace_back( static_cast< cppu::OWeakObject * >(this), i.first, false, -1, css::uno::Any(), - css::uno::Any())); + css::uno::Any()); } } } @@ -1759,11 +1757,10 @@ void Access::initBroadcasterAndChanges( //TODO: non-void ReplacedElement } if (collectPropChanges) { - propChanges.push_back( - css::beans::PropertyChangeEvent( + propChanges.emplace_back( static_cast< cppu::OWeakObject * >(this), i.first, false, -1, css::uno::Any(), - css::uno::Any())); + css::uno::Any()); } } break; @@ -1895,11 +1892,10 @@ void Access::initBroadcasterAndChanges( //TODO: non-void ReplacedElement } if (collectPropChanges) { - propChanges.push_back( - css::beans::PropertyChangeEvent( + propChanges.emplace_back( static_cast< cppu::OWeakObject * >(this), i.first, false, -1, css::uno::Any(), - css::uno::Any())); + css::uno::Any()); } } break; diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx index 87481cc28749..06e502ade75b 100644 --- a/configmgr/source/broadcaster.cxx +++ b/configmgr/source/broadcaster.cxx @@ -57,39 +57,35 @@ void Broadcaster::addDisposeNotification( css::uno::Reference< css::lang::XEventListener > const & listener, css::lang::EventObject const & event) { - disposeNotifications_.push_back(DisposeNotification(listener, event)); + disposeNotifications_.emplace_back(listener, event); } void Broadcaster::addContainerElementReplacedNotification( css::uno::Reference< css::container::XContainerListener > const & listener, css::container::ContainerEvent const & event) { - containerElementReplacedNotifications_.push_back( - ContainerNotification(listener, event)); + containerElementReplacedNotifications_.emplace_back(listener, event); } void Broadcaster::addContainerElementInsertedNotification( css::uno::Reference< css::container::XContainerListener > const & listener, css::container::ContainerEvent const & event) { - containerElementInsertedNotifications_.push_back( - ContainerNotification(listener, event)); + containerElementInsertedNotifications_.emplace_back(listener, event); } void Broadcaster::addContainerElementRemovedNotification( css::uno::Reference< css::container::XContainerListener > const & listener, css::container::ContainerEvent const & event) { - containerElementRemovedNotifications_.push_back( - ContainerNotification(listener, event)); + containerElementRemovedNotifications_.emplace_back(listener, event); } void Broadcaster::addPropertyChangeNotification( css::uno::Reference< css::beans::XPropertyChangeListener > const & listener, css::beans::PropertyChangeEvent const & event) { - propertyChangeNotifications_.push_back( - PropertyChangeNotification(listener, event)); + propertyChangeNotifications_.emplace_back(listener, event); } void Broadcaster::addPropertiesChangeNotification( @@ -97,15 +93,14 @@ void Broadcaster::addPropertiesChangeNotification( listener, css::uno::Sequence< css::beans::PropertyChangeEvent > const & event) { - propertiesChangeNotifications_.push_back( - PropertiesChangeNotification(listener, event)); + propertiesChangeNotifications_.emplace_back(listener, event); } void Broadcaster::addChangesNotification( css::uno::Reference< css::util::XChangesListener > const & listener, css::util::ChangesEvent const & event) { - changesNotifications_.push_back(ChangesNotification(listener, event)); + changesNotifications_.emplace_back(listener, event); } void Broadcaster::send() { diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index af4a2396e285..19516773173a 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -792,7 +792,7 @@ void Components::parseXcdFiles(int layer, OUString const & url) { if (manager->parse(nullptr)) { processedDeps.insert(name); } else { - unres.push_back(UnresolvedListItem(name, manager)); + unres.emplace_back(name, manager); } } } diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 7a9c2b96c3b4..7c2312954917 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -538,10 +538,9 @@ namespace cppcanvas { SAL_INFO("cppcanvas.emf", "EMF+\t\tadd poly action"); - maActions.push_back( - MtfAction( + maActions.emplace_back( pPolyAction, - rParms.mrCurrActionIndex ) ); + rParms.mrCurrActionIndex ); rParms.mrCurrActionIndex += pPolyAction->getActionCount()-1; } @@ -583,7 +582,7 @@ namespace cppcanvas std::shared_ptr<Action> pAction2(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState)); if (pAction2) { - maActions.push_back(MtfAction(pAction2, rParms.mrCurrActionIndex)); + maActions.emplace_back(pAction2, rParms.mrCurrActionIndex); rParms.mrCurrActionIndex += pAction2->getActionCount()-1; } rState.isFillColorSet = bWasFillColorSet; @@ -593,7 +592,7 @@ namespace cppcanvas std::shared_ptr<Action> pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState, rAttributes)); if (pAction) { - maActions.push_back(MtfAction(pAction, rParms.mrCurrActionIndex)); + maActions.emplace_back(pAction, rParms.mrCurrActionIndex); rParms.mrCurrActionIndex += pAction->getActionCount()-1; } } @@ -688,7 +687,7 @@ namespace cppcanvas std::shared_ptr<Action> pPolyAction(internal::PolyPolyActionFactory::createPolyPolyAction(aFinalPolyPolygon, rParms.mrCanvas, rState, aPolygonAttributes)); if( pPolyAction ) { - maActions.push_back(MtfAction(pPolyAction, rParms.mrCurrActionIndex)); + maActions.emplace_back(pPolyAction, rParms.mrCurrActionIndex); rParms.mrCurrActionIndex += pPolyAction->getActionCount()-1; } } @@ -1243,8 +1242,8 @@ namespace cppcanvas rState)); if( pBmpAction ) { - maActions.push_back( MtfAction( pBmpAction, - rFactoryParms.mrCurrActionIndex ) ); + maActions.emplace_back( pBmpAction, + rFactoryParms.mrCurrActionIndex ); rFactoryParms.mrCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -1316,10 +1315,9 @@ namespace cppcanvas { SAL_INFO("cppcanvas.emf", "EMF+\t\tadd text action"); - maActions.push_back( - MtfAction( + maActions.emplace_back( pTextAction, - rFactoryParms.mrCurrActionIndex ) ); + rFactoryParms.mrCurrActionIndex ); rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1; } @@ -1632,10 +1630,9 @@ namespace cppcanvas { SAL_INFO("cppcanvas.emf", "EMF+\t\tadd text action"); - maActions.push_back( - MtfAction( + maActions.emplace_back( pTextAction, - rFactoryParms.mrCurrActionIndex ) ); + rFactoryParms.mrCurrActionIndex ); rFactoryParms.mrCurrActionIndex += pTextAction->getActionCount()-1; } diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 0df7f6a9032e..418bd5e2478d 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -397,10 +397,9 @@ namespace cppcanvas if( pPolyAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pPolyAction, - rParms.mrCurrActionIndex ) ); + rParms.mrCurrActionIndex ); rParms.mrCurrActionIndex += pPolyAction->getActionCount()-1; } @@ -703,10 +702,9 @@ namespace cppcanvas if( pPolyAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pPolyAction, - rParms.mrCurrActionIndex ) ); + rParms.mrCurrActionIndex ); rParms.mrCurrActionIndex += pPolyAction->getActionCount()-1; } @@ -1018,17 +1016,15 @@ namespace cppcanvas if( pTextAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pTextAction, - rParms.mrCurrActionIndex ) ); + rParms.mrCurrActionIndex ); if ( pStrikeoutTextAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pStrikeoutTextAction, - rParms.mrCurrActionIndex ) ); + rParms.mrCurrActionIndex ); } rParms.mrCurrActionIndex += pTextAction->getActionCount()-1; @@ -1739,10 +1735,9 @@ namespace cppcanvas if( pPolyAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pPolyAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pPolyAction->getActionCount()-1; } @@ -1805,10 +1800,9 @@ namespace cppcanvas if( pPointAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pPointAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pPointAction->getActionCount()-1; } @@ -1831,10 +1825,9 @@ namespace cppcanvas if( pPointAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pPointAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pPointAction->getActionCount()-1; } @@ -1870,10 +1863,9 @@ namespace cppcanvas if( pLineAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pLineAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pLineAction->getActionCount()-1; } @@ -1901,10 +1893,9 @@ namespace cppcanvas if( pLineAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pLineAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pLineAction->getActionCount()-1; } @@ -2055,10 +2046,9 @@ namespace cppcanvas if( pLineAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pLineAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pLineAction->getActionCount()-1; } @@ -2081,10 +2071,9 @@ namespace cppcanvas if( pLineAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pLineAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pLineAction->getActionCount()-1; } @@ -2127,10 +2116,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2153,10 +2141,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2186,10 +2173,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2210,10 +2196,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2236,10 +2221,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2269,10 +2253,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2299,10 +2282,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2331,10 +2313,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2369,10 +2350,9 @@ namespace cppcanvas if( pBmpAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pBmpAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pBmpAction->getActionCount()-1; } @@ -2407,10 +2387,9 @@ namespace cppcanvas if( pPolyAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pPolyAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pPolyAction->getActionCount()-1; } @@ -2444,10 +2423,9 @@ namespace cppcanvas if( pFloatTransAction ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pFloatTransAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pFloatTransAction->getActionCount()-1; } @@ -2522,10 +2500,9 @@ namespace cppcanvas if( pPolyAction.get() ) { - maActions.push_back( - MtfAction( + maActions.emplace_back( pPolyAction, - io_rCurrActionIndex ) ); + io_rCurrActionIndex ); io_rCurrActionIndex += pPolyAction->getActionCount()-1; } diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index a834f265978a..9c9a9fa060de 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -241,81 +241,81 @@ void SvxMacroTabPage_::InitResources() // Note: the order here controls the order in which the events are displayed in the UI! // the event name to UI string mappings for App Events - aDisplayNames.push_back( EventDisplayName( "OnStartApp", RID_SVXSTR_EVENT_STARTAPP ) ); - aDisplayNames.push_back( EventDisplayName( "OnCloseApp", RID_SVXSTR_EVENT_CLOSEAPP ) ); - aDisplayNames.push_back( EventDisplayName( "OnCreate", RID_SVXSTR_EVENT_CREATEDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnNew", RID_SVXSTR_EVENT_NEWDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnLoadFinished", RID_SVXSTR_EVENT_LOADDOCFINISHED ) ); - aDisplayNames.push_back( EventDisplayName( "OnLoad", RID_SVXSTR_EVENT_OPENDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnPrepareUnload", RID_SVXSTR_EVENT_PREPARECLOSEDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnUnload", RID_SVXSTR_EVENT_CLOSEDOC ) ) ; - aDisplayNames.push_back( EventDisplayName( "OnViewCreated", RID_SVXSTR_EVENT_VIEWCREATED ) ); - aDisplayNames.push_back( EventDisplayName( "OnPrepareViewClosing", RID_SVXSTR_EVENT_PREPARECLOSEVIEW ) ); - aDisplayNames.push_back( EventDisplayName( "OnViewClosed", RID_SVXSTR_EVENT_CLOSEVIEW ) ) ; - aDisplayNames.push_back( EventDisplayName( "OnFocus", RID_SVXSTR_EVENT_ACTIVATEDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnUnfocus", RID_SVXSTR_EVENT_DEACTIVATEDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnSave", RID_SVXSTR_EVENT_SAVEDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnSaveDone", RID_SVXSTR_EVENT_SAVEDOCDONE ) ); - aDisplayNames.push_back( EventDisplayName( "OnSaveFailed", RID_SVXSTR_EVENT_SAVEDOCFAILED ) ); - aDisplayNames.push_back( EventDisplayName( "OnSaveAs", RID_SVXSTR_EVENT_SAVEASDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnSaveAsDone", RID_SVXSTR_EVENT_SAVEASDOCDONE ) ); - aDisplayNames.push_back( EventDisplayName( "OnSaveAsFailed", RID_SVXSTR_EVENT_SAVEASDOCFAILED ) ); - aDisplayNames.push_back( EventDisplayName( "OnCopyTo", RID_SVXSTR_EVENT_COPYTODOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnCopyToDone", RID_SVXSTR_EVENT_COPYTODOCDONE ) ); - aDisplayNames.push_back( EventDisplayName( "OnCopyToFailed", RID_SVXSTR_EVENT_COPYTODOCFAILED ) ); - aDisplayNames.push_back( EventDisplayName( "OnPrint", RID_SVXSTR_EVENT_PRINTDOC ) ); - aDisplayNames.push_back( EventDisplayName( "OnModifyChanged", RID_SVXSTR_EVENT_MODIFYCHANGED ) ); - aDisplayNames.push_back( EventDisplayName( "OnTitleChanged", RID_SVXSTR_EVENT_TITLECHANGED ) ); + aDisplayNames.emplace_back( "OnStartApp", RID_SVXSTR_EVENT_STARTAPP ); + aDisplayNames.emplace_back( "OnCloseApp", RID_SVXSTR_EVENT_CLOSEAPP ); + aDisplayNames.emplace_back( "OnCreate", RID_SVXSTR_EVENT_CREATEDOC ); + aDisplayNames.emplace_back( "OnNew", RID_SVXSTR_EVENT_NEWDOC ); + aDisplayNames.emplace_back( "OnLoadFinished", RID_SVXSTR_EVENT_LOADDOCFINISHED ); + aDisplayNames.emplace_back( "OnLoad", RID_SVXSTR_EVENT_OPENDOC ); + aDisplayNames.emplace_back( "OnPrepareUnload", RID_SVXSTR_EVENT_PREPARECLOSEDOC ); + aDisplayNames.emplace_back( "OnUnload", RID_SVXSTR_EVENT_CLOSEDOC ) ; + aDisplayNames.emplace_back( "OnViewCreated", RID_SVXSTR_EVENT_VIEWCREATED ); + aDisplayNames.emplace_back( "OnPrepareViewClosing", RID_SVXSTR_EVENT_PREPARECLOSEVIEW ); + aDisplayNames.emplace_back( "OnViewClosed", RID_SVXSTR_EVENT_CLOSEVIEW ) ; + aDisplayNames.emplace_back( "OnFocus", RID_SVXSTR_EVENT_ACTIVATEDOC ); + aDisplayNames.emplace_back( "OnUnfocus", RID_SVXSTR_EVENT_DEACTIVATEDOC ); + aDisplayNames.emplace_back( "OnSave", RID_SVXSTR_EVENT_SAVEDOC ); + aDisplayNames.emplace_back( "OnSaveDone", RID_SVXSTR_EVENT_SAVEDOCDONE ); + aDisplayNames.emplace_back( "OnSaveFailed", RID_SVXSTR_EVENT_SAVEDOCFAILED ); + aDisplayNames.emplace_back( "OnSaveAs", RID_SVXSTR_EVENT_SAVEASDOC ); + aDisplayNames.emplace_back( "OnSaveAsDone", RID_SVXSTR_EVENT_SAVEASDOCDONE ); + aDisplayNames.emplace_back( "OnSaveAsFailed", RID_SVXSTR_EVENT_SAVEASDOCFAILED ); + aDisplayNames.emplace_back( "OnCopyTo", RID_SVXSTR_EVENT_COPYTODOC ); + aDisplayNames.emplace_back( "OnCopyToDone", RID_SVXSTR_EVENT_COPYTODOCDONE ); + aDisplayNames.emplace_back( "OnCopyToFailed", RID_SVXSTR_EVENT_COPYTODOCFAILED ); + aDisplayNames.emplace_back( "OnPrint", RID_SVXSTR_EVENT_PRINTDOC ); + aDisplayNames.emplace_back( "OnModifyChanged", RID_SVXSTR_EVENT_MODIFYCHANGED ); + aDisplayNames.emplace_back( "OnTitleChanged", RID_SVXSTR_EVENT_TITLECHANGED ); // application specific events - aDisplayNames.push_back( EventDisplayName( "OnMailMerge", RID_SVXSTR_EVENT_MAILMERGE ) ); - aDisplayNames.push_back( EventDisplayName( "OnMailMergeFinished", RID_SVXSTR_EVENT_MAILMERGE_END ) ); - aDisplayNames.push_back( EventDisplayName( "OnFieldMerge", RID_SVXSTR_EVENT_FIELDMERGE ) ); - aDisplayNames.push_back( EventDisplayName( "OnFieldMergeFinished", RID_SVXSTR_EVENT_FIELDMERGE_FINISHED ) ); - aDisplayNames.push_back( EventDisplayName( "OnPageCountChange", RID_SVXSTR_EVENT_PAGECOUNTCHANGE ) ); - aDisplayNames.push_back( EventDisplayName( "OnSubComponentOpened", RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED ) ); - aDisplayNames.push_back( EventDisplayName( "OnSubComponentClosed", RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED ) ); - aDisplayNames.push_back( EventDisplayName( "OnSelect", RID_SVXSTR_EVENT_SELECTIONCHANGED ) ); - aDisplayNames.push_back( EventDisplayName( "OnDoubleClick", RID_SVXSTR_EVENT_DOUBLECLICK ) ); - aDisplayNames.push_back( EventDisplayName( "OnRightClick", RID_SVXSTR_EVENT_RIGHTCLICK ) ); - aDisplayNames.push_back( EventDisplayName( "OnCalculate", RID_SVXSTR_EVENT_CALCULATE ) ); - aDisplayNames.push_back( EventDisplayName( "OnChange", RID_SVXSTR_EVENT_CONTENTCHANGED ) ); + aDisplayNames.emplace_back( "OnMailMerge", RID_SVXSTR_EVENT_MAILMERGE ); + aDisplayNames.emplace_back( "OnMailMergeFinished", RID_SVXSTR_EVENT_MAILMERGE_END ); + aDisplayNames.emplace_back( "OnFieldMerge", RID_SVXSTR_EVENT_FIELDMERGE ); + aDisplayNames.emplace_back( "OnFieldMergeFinished", RID_SVXSTR_EVENT_FIELDMERGE_FINISHED ); + aDisplayNames.emplace_back( "OnPageCountChange", RID_SVXSTR_EVENT_PAGECOUNTCHANGE ); + aDisplayNames.emplace_back( "OnSubComponentOpened", RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED ); + aDisplayNames.emplace_back( "OnSubComponentClosed", RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED ); + aDisplayNames.emplace_back( "OnSelect", RID_SVXSTR_EVENT_SELECTIONCHANGED ); + aDisplayNames.emplace_back( "OnDoubleClick", RID_SVXSTR_EVENT_DOUBLECLICK ); + aDisplayNames.emplace_back( "OnRightClick", RID_SVXSTR_EVENT_RIGHTCLICK ); + aDisplayNames.emplace_back( "OnCalculate", RID_SVXSTR_EVENT_CALCULATE ); + aDisplayNames.emplace_back( "OnChange", RID_SVXSTR_EVENT_CONTENTCHANGED ); // the event name to UI string mappings for forms & dialogs - aDisplayNames.push_back( EventDisplayName( "approveAction", RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED ) ); - aDisplayNames.push_back( EventDisplayName( "actionPerformed", RID_SVXSTR_EVENT_ACTIONPERFORMED ) ); - aDisplayNames.push_back( EventDisplayName( "changed", RID_SVXSTR_EVENT_CHANGED ) ); - aDisplayNames.push_back( EventDisplayName( "textChanged", RID_SVXSTR_EVENT_TEXTCHANGED ) ); - aDisplayNames.push_back( EventDisplayName( "itemStateChanged", RID_SVXSTR_EVENT_ITEMSTATECHANGED ) ); - aDisplayNames.push_back( EventDisplayName( "focusGained", RID_SVXSTR_EVENT_FOCUSGAINED ) ); - aDisplayNames.push_back( EventDisplayName( "focusLost", RID_SVXSTR_EVENT_FOCUSLOST ) ); - aDisplayNames.push_back( EventDisplayName( "keyPressed", RID_SVXSTR_EVENT_KEYTYPED ) ); - aDisplayNames.push_back( EventDisplayName( "keyReleased", RID_SVXSTR_EVENT_KEYUP ) ); - aDisplayNames.push_back( EventDisplayName( "mouseEntered", RID_SVXSTR_EVENT_MOUSEENTERED ) ); - aDisplayNames.push_back( EventDisplayName( "mouseDragged", RID_SVXSTR_EVENT_MOUSEDRAGGED ) ); - aDisplayNames.push_back( EventDisplayName( "mouseMoved", RID_SVXSTR_EVENT_MOUSEMOVED ) ); - aDisplayNames.push_back( EventDisplayName( "mousePressed", RID_SVXSTR_EVENT_MOUSEPRESSED ) ); - aDisplayNames.push_back( EventDisplayName( "mouseReleased", RID_SVXSTR_EVENT_MOUSERELEASED ) ); - aDisplayNames.push_back( EventDisplayName( "mouseExited", RID_SVXSTR_EVENT_MOUSEEXITED ) ); - aDisplayNames.push_back( EventDisplayName( "approveReset", RID_SVXSTR_EVENT_APPROVERESETTED ) ); - aDisplayNames.push_back( EventDisplayName( "resetted", RID_SVXSTR_EVENT_RESETTED ) ); - aDisplayNames.push_back( EventDisplayName( "approveSubmit", RID_SVXSTR_EVENT_SUBMITTED ) ); - aDisplayNames.push_back( EventDisplayName( "approveUpdate", RID_SVXSTR_EVENT_BEFOREUPDATE ) ); - aDisplayNames.push_back( EventDisplayName( "updated", RID_SVXSTR_EVENT_AFTERUPDATE ) ); - aDisplayNames.push_back( EventDisplayName( "loaded", RID_SVXSTR_EVENT_LOADED ) ); - aDisplayNames.push_back( EventDisplayName( "reloading", RID_SVXSTR_EVENT_RELOADING ) ); - aDisplayNames.push_back( EventDisplayName( "reloaded", RID_SVXSTR_EVENT_RELOADED ) ); - aDisplayNames.push_back( EventDisplayName( "unloading", RID_SVXSTR_EVENT_UNLOADING ) ); - aDisplayNames.push_back( EventDisplayName( "unloaded", RID_SVXSTR_EVENT_UNLOADED ) ); - aDisplayNames.push_back( EventDisplayName( "confirmDelete", RID_SVXSTR_EVENT_CONFIRMDELETE ) ); - aDisplayNames.push_back( EventDisplayName( "approveRowChange", RID_SVXSTR_EVENT_APPROVEROWCHANGE ) ); - aDisplayNames.push_back( EventDisplayName( "rowChanged", RID_SVXSTR_EVENT_ROWCHANGE ) ); - aDisplayNames.push_back( EventDisplayName( "approveCursorMove", RID_SVXSTR_EVENT_POSITIONING ) ); - aDisplayNames.push_back( EventDisplayName( "cursorMoved", RID_SVXSTR_EVENT_POSITIONED ) ); - aDisplayNames.push_back( EventDisplayName( "approveParameter", RID_SVXSTR_EVENT_APPROVEPARAMETER ) ); - aDisplayNames.push_back( EventDisplayName( "errorOccured", RID_SVXSTR_EVENT_ERROROCCURRED ) ); - aDisplayNames.push_back( EventDisplayName( "adjustmentValueChanged", RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED ) ); + aDisplayNames.emplace_back( "approveAction", RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED ); + aDisplayNames.emplace_back( "actionPerformed", RID_SVXSTR_EVENT_ACTIONPERFORMED ); + aDisplayNames.emplace_back( "changed", RID_SVXSTR_EVENT_CHANGED ); + aDisplayNames.emplace_back( "textChanged", RID_SVXSTR_EVENT_TEXTCHANGED ); + aDisplayNames.emplace_back( "itemStateChanged", RID_SVXSTR_EVENT_ITEMSTATECHANGED ); + aDisplayNames.emplace_back( "focusGained", RID_SVXSTR_EVENT_FOCUSGAINED ); + aDisplayNames.emplace_back( "focusLost", RID_SVXSTR_EVENT_FOCUSLOST ); + aDisplayNames.emplace_back( "keyPressed", RID_SVXSTR_EVENT_KEYTYPED ); + aDisplayNames.emplace_back( "keyReleased", RID_SVXSTR_EVENT_KEYUP ); + aDisplayNames.emplace_back( "mouseEntered", RID_SVXSTR_EVENT_MOUSEENTERED ); + aDisplayNames.emplace_back( "mouseDragged", RID_SVXSTR_EVENT_MOUSEDRAGGED ); + aDisplayNames.emplace_back( "mouseMoved", RID_SVXSTR_EVENT_MOUSEMOVED ); + aDisplayNames.emplace_back( "mousePressed", RID_SVXSTR_EVENT_MOUSEPRESSED ); + aDisplayNames.emplace_back( "mouseReleased", RID_SVXSTR_EVENT_MOUSERELEASED ); + aDisplayNames.emplace_back( "mouseExited", RID_SVXSTR_EVENT_MOUSEEXITED ); + aDisplayNames.emplace_back( "approveReset", RID_SVXSTR_EVENT_APPROVERESETTED ); + aDisplayNames.emplace_back( "resetted", RID_SVXSTR_EVENT_RESETTED ); + aDisplayNames.emplace_back( "approveSubmit", RID_SVXSTR_EVENT_SUBMITTED ); + aDisplayNames.emplace_back( "approveUpdate", RID_SVXSTR_EVENT_BEFOREUPDATE ); + aDisplayNames.emplace_back( "updated", RID_SVXSTR_EVENT_AFTERUPDATE ); + aDisplayNames.emplace_back( "loaded", RID_SVXSTR_EVENT_LOADED ); + aDisplayNames.emplace_back( "reloading", RID_SVXSTR_EVENT_RELOADING ); + aDisplayNames.emplace_back( "reloaded", RID_SVXSTR_EVENT_RELOADED ); + aDisplayNames.emplace_back( "unloading", RID_SVXSTR_EVENT_UNLOADING ); + aDisplayNames.emplace_back( "unloaded", RID_SVXSTR_EVENT_UNLOADED ); + aDisplayNames.emplace_back( "confirmDelete", RID_SVXSTR_EVENT_CONFIRMDELETE ); + aDisplayNames.emplace_back( "approveRowChange", RID_SVXSTR_EVENT_APPROVEROWCHANGE ); + aDisplayNames.emplace_back( "rowChanged", RID_SVXSTR_EVENT_ROWCHANGE ); + aDisplayNames.emplace_back( "approveCursorMove", RID_SVXSTR_EVENT_POSITIONING ); + aDisplayNames.emplace_back( "cursorMoved", RID_SVXSTR_EVENT_POSITIONED ); + aDisplayNames.emplace_back( "approveParameter", RID_SVXSTR_EVENT_APPROVEPARAMETER ); + aDisplayNames.emplace_back( "errorOccured", RID_SVXSTR_EVENT_ERROROCCURRED ); + aDisplayNames.emplace_back( "adjustmentValueChanged", RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED ); } // the following method is called when the user clicks OK diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 1939e2ca6f8d..3c5cb0db239a 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1796,7 +1796,7 @@ static void lcl_InsertBreakPosition_Impl( else ++aStart; } - rBreakPositions.push_back(LanguagePosition_Impl(nInsert, eLanguage)); + rBreakPositions.emplace_back(nInsert, eLanguage); } /*------------------------------------------------------------------------- Returns the text in spell portions. Each portion contains text with an diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 961e02dc93e1..ad9225903ff7 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -128,7 +128,7 @@ FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialTex ++context ) { - m_arrContextFields.push_back(OUString()); + m_arrContextFields.emplace_back(); m_plbForm->InsertEntry(*context); } m_plbForm->SelectEntryPos(nInitialContext); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index bf50ae2b07fd..b9e61db2f334 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -90,10 +90,10 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) std::vector<Image> imgVector; OUString aStrTitle; SvxIconChoiceCtrlEntry *pEntry; - imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLINETTP))); - imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLMAILTP))); - imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLDOCTP))); - imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLDOCNTP))); + imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLINETTP)); + imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLMAILTP)); + imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLDOCTP)); + imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLDOCNTP)); for(Image &aImage : imgVector ) { diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 4966b1fc2b1d..6f3da22abc6a 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -292,7 +292,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren( if (!aCurrentRange.isEmpty()) { - rControlDataCollection.push_back(ControlDataEntry(rCurrent, aCurrentRange)); + rControlDataCollection.emplace_back(rCurrent, aCurrentRange); } for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d68454e6f8d8..a9b74a538b33 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -498,7 +498,7 @@ CanvasSettings::CanvasSettings() : { Sequence<OUString> preferredImplementations; if( (xEntryNameAccess->getByName("PreferredImplementations") >>= preferredImplementations) ) - maAvailableImplementations.push_back( std::make_pair(*pCurr,preferredImplementations) ); + maAvailableImplementations.emplace_back(*pCurr,preferredImplementations ); } ++pCurr; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 4a49061026c9..5b3d1ecefae8 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -164,7 +164,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore }; for (size_t i = 0; i < SAL_N_ELEMENTS(pnBorderImgIds); ++i) - m_aBorderImgVec.push_back(BitmapEx(pnBorderImgIds[i])); + m_aBorderImgVec.emplace_back(pnBorderImgIds[i]); static const OUStringLiteral pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] = { @@ -176,7 +176,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore }; for (size_t i = 0; i < SAL_N_ELEMENTS(pnShadowImgIds); ++i) - m_aShadowImgVec.push_back(BitmapEx(pnShadowImgIds[i])); + m_aShadowImgVec.emplace_back(pnShadowImgIds[i]); assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT); if ( GetDPIScaleFactor() > 1 ) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 809a5dd0a778..cc4929af3ef4 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -369,7 +369,7 @@ void SvxLineTabPage::InitSymbols(MenuButton const * pButton) if(pObj==nullptr) break; pObj=pObj->Clone(); - m_aGrfNames.push_back(""); + m_aGrfNames.emplace_back(""); pPage->NbcInsertObject(pObj); if(m_pSymbolAttr) { |