From f30399c540f01f16f097b86ff518251324d558d7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 23 May 2013 10:11:49 +0200 Subject: Revert "fdo#46808, Convert chart2::Title service to new style" This reverts commit d256dbede60533369d1aac64cca34721183f6a8a: For one, the new css.chart2.XTitle2 looked unfinished, in that it transfered the direct properties of the old-style css.chart2.Title service into attributes, but left out all the properties inherited by the old-style service from css.style.ParagraphProperties, css.drawing.FillProperties, css.drawing.LineProperties (and that missing FIXME css.layout.LayoutElement, whatever that is supposed to be). This needs more thought, to either make available all propertiers as attributes, or none. For another, this broke JunitTest_chart2_unoapi (sch.ChXChartDocument, sch.ChartTitle), for hard-to-debug reasons. Conflicts: chart2/source/model/main/Title.cxx chart2/source/model/main/Title.hxx offapi/com/sun/star/chart2/XTitle2.idl sc/source/filter/inc/xlchart.hxx Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7 --- chart2/source/controller/dialogs/TitleDialogData.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chart2/source/controller/dialogs/TitleDialogData.cxx') diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index b1560dba7579..91d44353934e 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -62,10 +62,10 @@ void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChar nTitleIndex < static_cast< sal_Int32 >( TitleHelper::NORMAL_TITLE_END ); nTitleIndex++) { - uno::Reference< XTitle2 > xTitle = TitleHelper::getTitle( + uno::Reference< XTitle > xTitle = TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nTitleIndex ), xChartModel ); this->aExistenceList[nTitleIndex] = xTitle.is(); - this->aTextList[nTitleIndex] = TitleHelper::getCompleteString( xTitle ); + this->aTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle ); } } @@ -97,8 +97,8 @@ bool TitleDialogData::writeDifferenceToModel( else if( !pOldState || ( pOldState->aTextList[nN] != this->aTextList[nN] ) ) { //change content - uno::Reference< XTitle2 > xTitle = - TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ); + uno::Reference< XTitle > xTitle( + TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ) ); if(xTitle.is()) { TitleHelper::setCompleteString( this->aTextList[nN], xTitle, xContext ); -- cgit