diff options
Diffstat (limited to 'chart2/source/controller/chartapiwrapper')
11 files changed, 68 insertions, 68 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 3dcbd4210a9f..53e21e9cce90 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -491,7 +491,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() // ____ XShape ____ awt::Point SAL_CALL AxisWrapper::getPosition() { - awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( this->getAxis() ) ); + awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( getAxis() ) ); return aResult; } @@ -502,7 +502,7 @@ void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ ) awt::Size SAL_CALL AxisWrapper::getSize() { - awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) ); + awt::Size aSize( m_spChart2ModelContact->GetAxisSize( getAxis() ) ); return aSize; } @@ -581,7 +581,7 @@ void SAL_CALL AxisWrapper::removeEventListener( //ReferenceSizePropertyProvider void AxisWrapper::updateReferenceSize() { - Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getAxis(), uno::UNO_QUERY ); if( xProp.is() ) { if( xProp->getPropertyValue("ReferencePageSize").hasValue() ) @@ -592,7 +592,7 @@ void AxisWrapper::updateReferenceSize() Any AxisWrapper::getReferenceSize() { Any aRet; - Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getAxis(), uno::UNO_QUERY ); if( xProp.is() ) aRet = xProp->getPropertyValue("ReferencePageSize"); return aRet; @@ -631,7 +631,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis() // WrappedPropertySet Reference< beans::XPropertySet > AxisWrapper::getInnerPropertySet() { - return Reference< beans::XPropertySet >( this->getAxis(), uno::UNO_QUERY ); + return Reference< beans::XPropertySet >( getAxis(), uno::UNO_QUERY ); } const Sequence< beans::Property >& AxisWrapper::getPropertySequence() diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 4770c8d1dbf6..e2febd960ea7 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -52,12 +52,12 @@ Chart2ModelContact::Chart2ModelContact( Chart2ModelContact::~Chart2ModelContact() { - this->clear(); + clear(); } void Chart2ModelContact::setModel( const css::uno::Reference< css::frame::XModel >& xChartModel ) { - this->clear(); + clear(); m_xChartModel = xChartModel; mpModel = dynamic_cast<ChartModel*>(xChartModel.get()); uno::Reference< lang::XMultiServiceFactory > xTableFactory( xChartModel, uno::UNO_QUERY ); @@ -95,7 +95,7 @@ Reference< chart2::XChartDocument > Chart2ModelContact::getChart2Document() cons Reference< chart2::XDiagram > Chart2ModelContact::getChart2Diagram() const { - return ChartModelHelper::findDiagram( this->getChartModel() ); + return ChartModelHelper::findDiagram( getChartModel() ); } uno::Reference< lang::XUnoTunnel > const & Chart2ModelContact::getChartView() const diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index e1d872866b21..daa633e01eed 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -947,7 +947,7 @@ void ChartDocumentWrapper::setBaseDiagram( const OUString& rBaseDiagram ) uno::Reference< XDiagram > xDiagram( ChartDocumentWrapper::createInstance( rBaseDiagram ), uno::UNO_QUERY ); if( xDiagram.is() ) - this->setDiagram( xDiagram ); + setDiagram( xDiagram ); } void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAddIn ) @@ -979,7 +979,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const { // get additional non-chart shapes for XML export uno::Reference< drawing::XShapes > xFoundShapes; - uno::Reference< drawing::XDrawPage > xDrawPage( this->impl_getDrawPage() ); + uno::Reference< drawing::XDrawPage > xDrawPage( impl_getDrawPage() ); uno::Reference< drawing::XShapes > xDrawPageShapes( xDrawPage, uno::UNO_QUERY ); if( !xDrawPageShapes.is() ) @@ -1036,7 +1036,7 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang:: // ____ XDrawPageSupplier ____ uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage() { - return this->impl_getDrawPage(); + return impl_getDrawPage(); } uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() const @@ -1383,7 +1383,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( // this is a sort of dispose() from the new model,so release resources here try { - this->dispose(); + dispose(); } catch (const uno::Exception& ex) { diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 371249471359..52d59ff21b54 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -537,7 +537,7 @@ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Sour bool DataSeriesPointWrapper::isSupportingAreaProperties() { - Reference< chart2::XDataSeries > xSeries( this->getDataSeries() ); + Reference< chart2::XDataSeries > xSeries( getDataSeries() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) ); sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram ); @@ -565,7 +565,7 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties( { Reference< beans::XPropertySet > xPointProp; - Reference< chart2::XDataSeries > xSeries( this->getDataSeries() ); + Reference< chart2::XDataSeries > xSeries( getDataSeries() ); // may throw an IllegalArgumentException if( xSeries.is() ) @@ -577,7 +577,7 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties( //ReferenceSizePropertyProvider void DataSeriesPointWrapper::updateReferenceSize() { - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); if( xProp.is() ) { if( xProp->getPropertyValue("ReferencePageSize").hasValue() ) @@ -588,7 +588,7 @@ void DataSeriesPointWrapper::updateReferenceSize() Any DataSeriesPointWrapper::getReferenceSize() { Any aRet; - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); if( xProp.is() ) aRet = xProp->getPropertyValue("ReferencePageSize"); return aRet; @@ -794,16 +794,16 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert switch(aNewValue) { case css::chart::ChartErrorCategory_CONSTANT_VALUE: - aHigh = this->getPropertyValue("ConstantErrorHigh"); - aLow = this->getPropertyValue("ConstantErrorLow"); + aHigh = getPropertyValue("ConstantErrorHigh"); + aLow = getPropertyValue("ConstantErrorLow"); bSetHighAndLowValues = true; break; case css::chart::ChartErrorCategory_PERCENT: - aHigh = aLow = this->getPropertyValue("PercentageError"); + aHigh = aLow = getPropertyValue("PercentageError"); bSetHighAndLowValues = true; break; case css::chart::ChartErrorCategory_ERROR_MARGIN: - aHigh = aLow = this->getPropertyValue("ErrorMargin"); + aHigh = aLow = getPropertyValue("ErrorMargin"); bSetHighAndLowValues = true; break; default: @@ -817,14 +817,14 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert switch(aNewValue) { case css::chart::ChartErrorCategory_CONSTANT_VALUE: - this->setPropertyValue("ConstantErrorHigh",aHigh); - this->setPropertyValue("ConstantErrorLow",aLow); + setPropertyValue("ConstantErrorHigh",aHigh); + setPropertyValue("ConstantErrorLow",aLow); break; case css::chart::ChartErrorCategory_PERCENT: - this->setPropertyValue("PercentageError",aHigh); + setPropertyValue("PercentageError",aHigh); break; case css::chart::ChartErrorCategory_ERROR_MARGIN: - this->setPropertyValue("ErrorMargin",aHigh); + setPropertyValue("ErrorMargin",aHigh); break; default: break; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 67f3c256e549..d90aaa73f32c 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -727,7 +727,7 @@ awt::Point SAL_CALL DiagramWrapper::getPosition() void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet() ); if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); @@ -757,7 +757,7 @@ awt::Size SAL_CALL DiagramWrapper::getSize() void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet() ); if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); @@ -790,7 +790,7 @@ OUString SAL_CALL DiagramWrapper::getShapeType() void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); - uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) { xDiaProps->setPropertyValue( "RelativeSize", Any() ); @@ -799,7 +799,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() } sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) { - uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) { Any aRelativeSize( xDiaProps->getPropertyValue( "RelativeSize" ) ); @@ -813,13 +813,13 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); - uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(true) ); } sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() { - uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) { Any aRelativeSize( xDiaProps->getPropertyValue( "RelativeSize" ) ); @@ -841,7 +841,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); - uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(false) ); } @@ -1487,7 +1487,7 @@ private: //member WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) : WrappedProperty("NumberOfLines",OUString()) , m_spChart2ModelContact( spChart2ModelContact ) - , m_aOuterValue( this->getPropertyDefault(nullptr) ) + , m_aOuterValue( getPropertyDefault(nullptr) ) { } diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 9b20ac825035..5f763c67a272 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -84,7 +84,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP else { aRet = xInnerPropertySet->getPropertyValue( m_aInnerName ); - aRet = this->convertInnerToOuterValue( aRet ); + aRet = convertInnerToOuterValue( aRet ); } } return aRet; @@ -110,7 +110,7 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c return; //set corresponding LegendPosition - Any aInnerValue = this->convertOuterToInnerValue( rOuterValue ); + Any aInnerValue = convertOuterToInnerValue( rOuterValue ); xInnerPropertySet->setPropertyValue( m_aInnerName, aInnerValue ); //correct LegendExpansion @@ -282,7 +282,7 @@ awt::Point SAL_CALL LegendWrapper::getPosition() void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) { - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet() ); if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); @@ -302,13 +302,13 @@ awt::Size SAL_CALL LegendWrapper::getSize() void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) { - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet() ); if( xProp.is() ) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); awt::Rectangle aPageRectangle( 0,0,aPageSize.Width,aPageSize.Height); - awt::Point aPos( this->getPosition() ); + awt::Point aPos( getPosition() ); awt::Rectangle aNewPositionAndSize(aPos.X,aPos.Y,aSize.Width,aSize.Height); PositionAndSizeHelper::moveObject( OBJECTTYPE_LEGEND @@ -347,7 +347,7 @@ void SAL_CALL LegendWrapper::removeEventListener( //ReferenceSizePropertyProvider void LegendWrapper::updateReferenceSize() { - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); if( xProp.is() ) { if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() ) @@ -358,7 +358,7 @@ void LegendWrapper::updateReferenceSize() Any LegendWrapper::getReferenceSize() { Any aRet; - Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); if( xProp.is() ) aRet = xProp->getPropertyValue( "ReferencePageSize" ); diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index ecdffda68ad3..579252a64814 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -257,7 +257,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin OUString aPropertyName( rNameSeq[nN] ); try { - this->setPropertyValue( aPropertyName, rValueSeq[nN] ); + setPropertyValue( aPropertyName, rValueSeq[nN] ); } catch( const beans::UnknownPropertyException& ex ) { @@ -275,7 +275,7 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const u for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyValue( aPropertyName ); + aRetSeq[nN] = getPropertyValue( aPropertyName ); } } return aRetSeq; @@ -304,8 +304,8 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUStrin if( rPropertyName == m_aWrappedLineJointProperty.getOuterName() ) return beans::PropertyState_DEFAULT_VALUE; - uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); - uno::Any aValue( this->getPropertyValue( rPropertyName ) ); + uno::Any aDefault( getPropertyDefault( rPropertyName ) ); + uno::Any aValue( getPropertyValue( rPropertyName ) ); if( aDefault == aValue ) return beans::PropertyState_DEFAULT_VALUE; @@ -321,14 +321,14 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyState( aPropertyName ); + aRetSeq[nN] = getPropertyState( aPropertyName ); } } return aRetSeq; } void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName ) { - this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); + setPropertyValue( rPropertyName, getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName ) @@ -348,7 +348,7 @@ void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) { OUString aPropertyName( rPropSeq[nN].Name ); - this->setPropertyToDefault( aPropertyName ); + setPropertyToDefault( aPropertyName ); } } void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) @@ -356,7 +356,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OU for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - this->setPropertyToDefault( aPropertyName ); + setPropertyToDefault( aPropertyName ); } } uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) @@ -368,7 +368,7 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyDefault( aPropertyName ); + aRetSeq[nN] = getPropertyDefault( aPropertyName ); } } return aRetSeq; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 5c03301bb21c..bd4e44614e88 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -200,12 +200,12 @@ TitleWrapper::~TitleWrapper() // ____ XShape ____ awt::Point SAL_CALL TitleWrapper::getPosition() { - return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() ); + return m_spChart2ModelContact->GetTitlePosition( getTitleObject() ); } void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) { - Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xPropertySet( getInnerPropertySet() ); if(xPropertySet.is()) { awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() ); @@ -220,7 +220,7 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) awt::Size SAL_CALL TitleWrapper::getSize() { - return m_spChart2ModelContact->GetTitleSize( this->getTitleObject() ); + return m_spChart2ModelContact->GetTitleSize( getTitleObject() ); } void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ ) @@ -260,7 +260,7 @@ Reference< beans::XPropertySet > TitleWrapper::getFirstCharacterPropertySet() { Reference< beans::XPropertySet > xProp; - Reference< chart2::XTitle > xTitle( this->getTitleObject() ); + Reference< chart2::XTitle > xTitle( getTitleObject() ); if( xTitle.is()) { Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText()); @@ -299,7 +299,7 @@ void TitleWrapper::setFastCharacterPropertyValue( OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); - Reference< chart2::XTitle > xTitle( this->getTitleObject() ); + Reference< chart2::XTitle > xTitle( getTitleObject() ); if( xTitle.is()) { Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText()); @@ -426,7 +426,7 @@ void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPrope //ReferenceSizePropertyProvider void TitleWrapper::updateReferenceSize() { - Reference< beans::XPropertySet > xProp( this->getTitleObject(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getTitleObject(), uno::UNO_QUERY ); if( xProp.is() ) { if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() ) @@ -437,7 +437,7 @@ void TitleWrapper::updateReferenceSize() Any TitleWrapper::getReferenceSize() { Any aRet; - Reference< beans::XPropertySet > xProp( this->getTitleObject(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp( getTitleObject(), uno::UNO_QUERY ); if( xProp.is() ) aRet = xProp->getPropertyValue( "ReferencePageSize" ); @@ -457,7 +457,7 @@ Reference< chart2::XTitle > TitleWrapper::getTitleObject() Reference< beans::XPropertySet > TitleWrapper::getInnerPropertySet() { - return Reference< beans::XPropertySet >( this->getTitleObject(), uno::UNO_QUERY ); + return Reference< beans::XPropertySet >( getTitleObject(), uno::UNO_QUERY ); } const Sequence< beans::Property >& TitleWrapper::getPropertySequence() diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 256eb8c29461..ea7ea6e36a5c 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -233,7 +233,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString OUString aPropertyName( rNameSeq[nN] ); try { - this->setPropertyValue( aPropertyName, rValueSeq[nN] ); + setPropertyValue( aPropertyName, rValueSeq[nN] ); } catch( const beans::UnknownPropertyException& ex ) { @@ -251,7 +251,7 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyValue( aPropertyName ); + aRetSeq[nN] = getPropertyValue( aPropertyName ); } } return aRetSeq; @@ -272,8 +272,8 @@ void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< //XPropertyState beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName ) { - uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); - uno::Any aValue( this->getPropertyValue( rPropertyName ) ); + uno::Any aDefault( getPropertyDefault( rPropertyName ) ); + uno::Any aValue( getPropertyValue( rPropertyName ) ); if( aDefault == aValue ) return beans::PropertyState_DEFAULT_VALUE; @@ -289,14 +289,14 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyState( aPropertyName ); + aRetSeq[nN] = getPropertyState( aPropertyName ); } } return aRetSeq; } void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName ) { - this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); + setPropertyValue( rPropertyName, getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName ) @@ -316,7 +316,7 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) { OUString aPropertyName( rPropSeq[nN].Name ); - this->setPropertyToDefault( aPropertyName ); + setPropertyToDefault( aPropertyName ); } } void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq ) @@ -324,7 +324,7 @@ void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUS for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - this->setPropertyToDefault( aPropertyName ); + setPropertyToDefault( aPropertyName ); } } uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) @@ -336,7 +336,7 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyDefault( aPropertyName ); + aRetSeq[nN] = getPropertyDefault( aPropertyName ); } } return aRetSeq; diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 2c34d58db293..125e5f48785e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -48,7 +48,7 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons throw lang::IllegalArgumentException( "Property 'NumberFormat' requires value of type sal_Int32", nullptr, 0 ); if(xInnerPropertySet.is()) - xInnerPropertySet->setPropertyValue(getInnerName(), this->convertOuterToInnerValue(rOuterValue)); + xInnerPropertySet->setPropertyValue(getInnerName(), convertOuterToInnerValue(rOuterValue)); } Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 1336709da311..449b347057bf 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -67,7 +67,7 @@ public: if (!xChartTypePropertySet.is()) continue; - Any aSingleValue = this->convertInnerToOuterValue( xChartTypePropertySet->getPropertyValue(m_aOwnInnerName) ); + Any aSingleValue = convertInnerToOuterValue( xChartTypePropertySet->getPropertyValue(m_aOwnInnerName) ); PROPERTYTYPE aCurValue = PROPERTYTYPE(); aSingleValue >>= aCurValue; if( !bHasDetectableInnerValue ) @@ -116,7 +116,7 @@ public: css::uno::Reference< css::beans::XPropertySet > xChartTypePropertySet( aChartTypes[nN], css::uno::UNO_QUERY ); if( xChartTypePropertySet.is() ) { - xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,this->convertOuterToInnerValue(uno::Any(aNewValue))); + xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,convertOuterToInnerValue(uno::Any(aNewValue))); } } catch( uno::Exception & ex ) |