diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 08:54:47 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 08:50:50 +0000 |
commit | 83721f4365d234b62f9e3517345c8d3fda19f2c6 (patch) | |
tree | af77c202dbdf0b969559441c724020e5d7a9da92 /chart2/source/controller/sidebar | |
parent | 9007cc7bcaa8bc1b38c54f167349f71373f02dec (diff) |
makeAny->Any in basctl..chart2
Change-Id: Ief1cdffbfc59ab4e35ac945d020772ff84c50d61
Reviewed-on: https://gerrit.libreoffice.org/33867
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller/sidebar')
8 files changed, 30 insertions, 30 deletions
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index d778ac428bc3..596e08fa8474 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -114,7 +114,7 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( { throw css::lang::WrappedTargetRuntimeException( "ChartPanelFactory::createUIElement exception", - nullptr, css::uno::makeAny(e)); + nullptr, css::uno::Any(e)); } return xElement; diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index d8612e542ba2..41c4b9c9c4d0 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -294,7 +294,7 @@ void ChartAreaPanel::setFillTransparence(const XFillTransparenceItem& rItem) if (!xPropSet.is()) return; - xPropSet->setPropertyValue("FillTransparence", css::uno::makeAny(rItem.GetValue())); + xPropSet->setPropertyValue("FillTransparence", css::uno::Any(rItem.GetValue())); } void ChartAreaPanel::setFillFloatTransparence( @@ -307,7 +307,7 @@ void ChartAreaPanel::setFillFloatTransparence( if (!rItem.IsEnabled()) { - xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::makeAny(OUString())); + xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::Any(OUString())); return; } @@ -315,7 +315,7 @@ void ChartAreaPanel::setFillFloatTransparence( css::uno::Any aGradientVal; rItem.QueryValue(aGradientVal, MID_FILLGRADIENT); OUString aNewName = PropertyHelper::addTransparencyGradientUniqueNameToTable(aGradientVal, css::uno::Reference<css::lang::XMultiServiceFactory>(mxModel, css::uno::UNO_QUERY_THROW), aName); - xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::makeAny(aNewName)); + xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::Any(aNewName)); } void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem) @@ -325,7 +325,7 @@ void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem) if (!xPropSet.is()) return; - xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(rItem.GetValue())); + xPropSet->setPropertyValue("FillStyle", css::uno::Any(rItem.GetValue())); } void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem, @@ -336,8 +336,8 @@ void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue())); - xPropSet->setPropertyValue("FillColor", css::uno::makeAny(rColorItem.GetValue())); + xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue("FillColor", css::uno::Any(rColorItem.GetValue())); } void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem, @@ -349,8 +349,8 @@ void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue())); - xPropSet->setPropertyValue("FillGradientName", css::uno::makeAny(rGradientItem.GetValue())); + xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue("FillGradientName", css::uno::Any(rGradientItem.GetValue())); } void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem, @@ -362,8 +362,8 @@ void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue())); - xPropSet->setPropertyValue("FillHatchName", css::uno::makeAny(rHatchItem.GetValue())); + xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue("FillHatchName", css::uno::Any(rHatchItem.GetValue())); } void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, @@ -375,8 +375,8 @@ void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::makeAny(pStyleItem->GetValue())); - xPropSet->setPropertyValue("FillBitmapName", css::uno::makeAny(rBitmapItem.GetValue())); + xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue("FillBitmapName", css::uno::Any(rBitmapItem.GetValue())); } void ChartAreaPanel::updateData() diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 83492a5dece0..715f1e6c9700 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -68,7 +68,7 @@ void setLabelShown(const css::uno::Reference<css::frame::XModel>& xModel, if (!xAxis.is()) return; - xAxis->setPropertyValue("DisplayLabels", css::uno::makeAny(bVisible)); + xAxis->setPropertyValue("DisplayLabels", css::uno::Any(bVisible)); } struct AxisLabelPosMap @@ -124,7 +124,7 @@ void setLabelPosition(const css::uno::Reference<css::frame::XModel>& xModel, ePos = i.ePos; } - xAxis->setPropertyValue("LabelPosition", css::uno::makeAny(ePos)); + xAxis->setPropertyValue("LabelPosition", css::uno::Any(ePos)); } bool isReverse(const css::uno::Reference<css::frame::XModel>& xModel, @@ -187,7 +187,7 @@ void setAxisRotation(const css::uno::Reference<css::frame::XModel>& xModel, if (!xAxis.is()) return; - xAxis->setPropertyValue("TextRotation", css::uno::makeAny(nVal)); + xAxis->setPropertyValue("TextRotation", css::uno::Any(nVal)); } double getAxisRotation(const css::uno::Reference<css::frame::XModel>& xModel, diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index ee931d06503f..3387e47254d3 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -72,7 +72,7 @@ void ChartColorWrapper::operator()(const OUString& , const NamedColor& rColor) css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel); assert(xPropSet.is()); - xPropSet->setPropertyValue(maPropertyName, css::uno::makeAny(rColor.first.GetColor())); + xPropSet->setPropertyValue(maPropertyName, css::uno::Any(rColor.first.GetColor())); } void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel>& xModel) diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index c037feadd012..d25b9232ff3c 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -264,8 +264,8 @@ void setLegendPos(const css::uno::Reference<css::frame::XModel>& xModel, sal_Int assert(false); } - xLegendProp->setPropertyValue("AnchorPosition", css::uno::makeAny(eLegendPos)); - xLegendProp->setPropertyValue("Expansion", css::uno::makeAny(eExpansion)); + xLegendProp->setPropertyValue("AnchorPosition", css::uno::Any(eLegendPos)); + xLegendProp->setPropertyValue("Expansion", css::uno::Any(eExpansion)); if (eLegendPos != chart2::LegendPosition_CUSTOM) { diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 28cc584ad4d6..f359d409f573 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -101,7 +101,7 @@ void setShowPositiveError(const css::uno::Reference<css::frame::XModel>& xModel, if (!xPropSet.is()) return; - xPropSet->setPropertyValue("ShowPositiveError", css::uno::makeAny(bShow)); + xPropSet->setPropertyValue("ShowPositiveError", css::uno::Any(bShow)); } void setShowNegativeError(const css::uno::Reference<css::frame::XModel>& xModel, @@ -113,7 +113,7 @@ void setShowNegativeError(const css::uno::Reference<css::frame::XModel>& xModel, if (!xPropSet.is()) return; - xPropSet->setPropertyValue("ShowNegativeError", css::uno::makeAny(bShow)); + xPropSet->setPropertyValue("ShowNegativeError", css::uno::Any(bShow)); } struct ErrorBarTypeMap @@ -174,7 +174,7 @@ void setTypePos(const css::uno::Reference<css::frame::XModel>& xModel, nApi = i.nApi; } - xPropSet->setPropertyValue("ErrorBarStyle", css::uno::makeAny(nApi)); + xPropSet->setPropertyValue("ErrorBarStyle", css::uno::Any(nApi)); } double getValue(const css::uno::Reference<css::frame::XModel>& xModel, @@ -214,7 +214,7 @@ void setValue(const css::uno::Reference<css::frame::XModel>& xModel, if (eDir == ErrorBarDirection::NEGATIVE) aName = "NegativeError"; - xPropSet->setPropertyValue(aName, css::uno::makeAny(nVal)); + xPropSet->setPropertyValue(aName, css::uno::Any(nVal)); } OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 8fefe156675e..186df8b22d7b 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -255,7 +255,7 @@ void ChartLinePanel::setLineStyle(const XLineStyleItem& rItem) return; PreventUpdate aPreventUpdate(mbUpdate); - xPropSet->setPropertyValue("LineStyle", css::uno::makeAny(rItem.GetValue())); + xPropSet->setPropertyValue("LineStyle", css::uno::Any(rItem.GetValue())); } void ChartLinePanel::setLineDash(const XLineDashItem& rItem) @@ -273,7 +273,7 @@ void ChartLinePanel::setLineDash(const XLineDashItem& rItem) css::uno::Reference<css::lang::XMultiServiceFactory>(mxModel, css::uno::UNO_QUERY), ""); xPropSet->setPropertyValue("LineDash", aAny); - xPropSet->setPropertyValue("LineDashName", css::uno::makeAny(aDashName)); + xPropSet->setPropertyValue("LineDashName", css::uno::Any(aDashName)); } void ChartLinePanel::setLineEndStyle(const XLineEndItem* /*pItem*/) @@ -294,7 +294,7 @@ void ChartLinePanel::setLineJoint(const XLineJointItem* pItem) PreventUpdate aPreventUpdate(mbUpdate); if (pItem) - xPropSet->setPropertyValue("LineJoint", css::uno::makeAny(pItem->GetValue())); + xPropSet->setPropertyValue("LineJoint", css::uno::Any(pItem->GetValue())); } void ChartLinePanel::setLineCap(const XLineCapItem* /*pItem*/) @@ -310,7 +310,7 @@ void ChartLinePanel::setLineTransparency(const XLineTransparenceItem& rItem) return; PreventUpdate aPreventUpdate(mbUpdate); - xPropSet->setPropertyValue("LineTransparence", css::uno::makeAny(rItem.GetValue())); + xPropSet->setPropertyValue("LineTransparence", css::uno::Any(rItem.GetValue())); } void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem) @@ -322,7 +322,7 @@ void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem) return; PreventUpdate aPreventUpdate(mbUpdate); - xPropSet->setPropertyValue("LineWidth", css::uno::makeAny(rItem.GetValue())); + xPropSet->setPropertyValue("LineWidth", css::uno::Any(rItem.GetValue())); } } } diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index f8832e0ba061..6e48a4688e7f 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -137,7 +137,7 @@ void setDataLabelPlacement(const css::uno::Reference<css::frame::XModel>& xModel } } - xSeries->setPropertyValue("LabelPlacement", css::uno::makeAny(nApi)); + xSeries->setPropertyValue("LabelPlacement", css::uno::Any(nApi)); } bool isTrendlineVisible(const css::uno::Reference<css::frame::XModel>& xModel, @@ -231,7 +231,7 @@ void setAttachedAxisType(const css::uno::Reference<css::frame::XModel>& return; sal_Int32 nIndex = bPrimary ? 0 : 1; - xSeries->setPropertyValue("AttachedAxisIndex", css::uno::makeAny(nIndex)); + xSeries->setPropertyValue("AttachedAxisIndex", css::uno::Any(nIndex)); } css::uno::Reference<css::chart2::XChartType> getChartType( |