chart2/source/controller/dialogs/dlg_ChartType.cxx | 8 ++++- chart2/source/model/template/GL3DBarChartTypeTemplate.cxx | 21 ++++++++++++++ chart2/source/model/template/GL3DBarChartTypeTemplate.hxx | 5 +++ 3 files changed, 33 insertions(+), 1 deletion(-)
New commits: commit f27ec6c041b3ff27da9d6c1d3ad11eca5e0e7140 Author: Kohei Yoshida <[email protected]> Date: Fri Mar 28 09:10:55 2014 -0400 Transfer back properties from the chart type object to template object. Change-Id: I3484a2ae0141087835e34e4e174bdc24b3357854 diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index 13a3077..878695e 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -127,6 +127,27 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde return xResult; } +sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate( + const css::uno::Reference<css::chart2::XDiagram>& xDiagram, + sal_Bool bAdaptProperties ) + throw (css::uno::RuntimeException, std::exception) +{ + bool bResult = ChartTypeTemplate::matchesTemplate(xDiagram, bAdaptProperties); + + if (bResult && bAdaptProperties) + { + uno::Reference<chart2::XChartType> xChartType = DiagramHelper::getChartTypeByIndex(xDiagram, 0); + uno::Reference<beans::XPropertySet> xPS(xChartType, uno::UNO_QUERY); + if (xPS.is()) + { + setFastPropertyValue_NoBroadcast( + PROP_GL3DCHARTTYPE_ROUNDED_EDGE, xPS->getPropertyValue(CHART_UNONAME_ROUNDED_EDGE)); + } + } + + return bResult; +} + uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Reference<chart2::XChartType> >& /*xOldChartTypes*/ ) throw (::css::uno::RuntimeException, ::std::exception) diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index da9f191..eed03a1 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -39,6 +39,11 @@ public: // XChartTypeTemplate + virtual sal_Bool SAL_CALL matchesTemplate( + const css::uno::Reference<css::chart2::XDiagram>& xDiagram, + sal_Bool bAdaptProperties ) + throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ) throw (::css::uno::RuntimeException, ::std::exception); commit 2db72750fc7fa8ec55a5853d7885715d3645e7c1 Author: Kohei Yoshida <[email protected]> Date: Fri Mar 28 09:10:22 2014 -0400 Too long a line. Change-Id: I0b8f1b3b55cf0374ce1ff81d7798ea60848208d4 diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index ea9a496..657225f 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -43,7 +43,13 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent , m_xChartModel(xChartModel) , m_xCC( xContext ) { - m_pChartTypeTabPage = new ChartTypeTabPage(get_content_area(),uno::Reference< XChartDocument >::query(m_xChartModel),m_xCC,true/*live update*/,true/*hide title description*/); + m_pChartTypeTabPage = new ChartTypeTabPage( + get_content_area(), + uno::Reference<XChartDocument>::query(m_xChartModel), + m_xCC, + true/*live update*/, + true/*hide title description*/); + m_pChartTypeTabPage->initializePage(); m_pChartTypeTabPage->Show(); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
