diff options
Diffstat (limited to 'chart2/source/tools')
9 files changed, 39 insertions, 39 deletions
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index d3c0cf84fbd9..fe5adbca6dc6 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -138,9 +138,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul // optimize result uno::Sequence< geometry::RealPoint2D > aResult( 2 ); aResult[0].X = min; - aResult[0].Y = this->getCurveValue( min ); + aResult[0].Y = getCurveValue( min ); aResult[1].X = max; - aResult[1].Y = this->getCurveValue( max ); + aResult[1].Y = getCurveValue( max ); return aResult; } diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 439762471e26..cc6a7c31e49c 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -902,11 +902,11 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation sal_Int32 nLevelCount = lcl_getInnerLevelCount( aCategories ); if( nLevelCount == 1 ) { - aResult = this->getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::number( 0 ) ); + aResult = getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::number( 0 ) ); } else { - Sequence< OUString > aLabels = m_bDataInColumns ? this->getRowDescriptions() : this->getColumnDescriptions(); + Sequence< OUString > aLabels = m_bDataInColumns ? getRowDescriptions() : getColumnDescriptions(); aResult.realloc( aLabels.getLength() ); transform( aLabels.begin(), aLabels.end(), aResult.getArray(), CommonFunctors::makeAny< OUString >() ); diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 7c6e5240d14e..d9b2b5e02983 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -62,9 +62,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator: // optimize result uno::Sequence< geometry::RealPoint2D > aResult( 2 ); aResult[0].X = min; - aResult[0].Y = this->getCurveValue( min ); + aResult[0].Y = getCurveValue( min ); aResult[1].X = max; - aResult[1].Y = this->getCurveValue( max ); + aResult[1].Y = getCurveValue( max ); return aResult; } diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index 8102c6afb8d7..4891d5766ef9 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -115,9 +115,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul // optimize result uno::Sequence< geometry::RealPoint2D > aResult( 2 ); aResult[0].X = min; - aResult[0].Y = this->getCurveValue( min ); + aResult[0].Y = getCurveValue( min ); aResult[1].X = max; - aResult[1].Y = this->getCurveValue( max ); + aResult[1].Y = getCurveValue( max ); return aResult; } diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 92ae9ed8ef29..ea97330cce78 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -127,9 +127,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat // optimize result uno::Sequence< geometry::RealPoint2D > aResult( 2 ); aResult[0].X = min; - aResult[0].Y = this->getCurveValue( min ); + aResult[0].Y = getCurveValue( min ); aResult[1].X = max; - aResult[1].Y = this->getCurveValue( max ); + aResult[1].Y = getCurveValue( max ); return aResult; } diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 4a1dc26a468d..836f74f04deb 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -161,7 +161,7 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa if( bDoXScaling ) x = xInverseScaling->doScaling( x ); aResult[nP].X = x; - aResult[nP].Y = this->getCurveValue( x ); + aResult[nP].Y = getCurveValue( x ); } return aResult; diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index ef74d61e9dee..cb87cfa23f62 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -42,7 +42,7 @@ void WrappedDefaultProperty::setPropertyToDefault( { Reference< beans::XPropertySet > xInnerPropSet( xInnerPropertyState, uno::UNO_QUERY ); if( xInnerPropSet.is()) - this->setPropertyValue( m_aOuterDefaultValue, xInnerPropSet ); + setPropertyValue( m_aOuterDefaultValue, xInnerPropSet ); } uno::Any WrappedDefaultProperty::getPropertyDefault( @@ -58,8 +58,8 @@ beans::PropertyState WrappedDefaultProperty::getPropertyState( try { Reference< beans::XPropertySet > xInnerProp( xInnerPropertyState, uno::UNO_QUERY_THROW ); - uno::Any aValue = this->getPropertyValue( xInnerProp ); - if( m_aOuterDefaultValue == this->convertInnerToOuterValue( aValue )) + uno::Any aValue = getPropertyValue( xInnerProp ); + if( m_aOuterDefaultValue == convertInnerToOuterValue( aValue )) aState = beans::PropertyState_DEFAULT_VALUE; } catch( const beans::UnknownPropertyException& ex ) diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index 0b7c93c70dc6..d6ccf5895047 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -54,7 +54,7 @@ Any WrappedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const void WrappedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const { if(xInnerPropertySet.is()) - xInnerPropertySet->setPropertyValue( this->getInnerName(), this->convertOuterToInnerValue( rOuterValue ) ); + xInnerPropertySet->setPropertyValue( getInnerName(), convertOuterToInnerValue( rOuterValue ) ); } Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const @@ -62,16 +62,16 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x Any aRet; if( xInnerPropertySet.is() ) { - aRet = xInnerPropertySet->getPropertyValue( this->getInnerName() ); - aRet = this->convertInnerToOuterValue( aRet ); + aRet = xInnerPropertySet->getPropertyValue( getInnerName() ); + aRet = convertInnerToOuterValue( aRet ); } return aRet; } void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const { - if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() ) - xInnerPropertyState->setPropertyToDefault(this->getInnerName()); + if( xInnerPropertyState.is() && !getInnerName().isEmpty() ) + xInnerPropertyState->setPropertyToDefault(getInnerName()); else { Reference< beans::XPropertySet > xInnerProp( xInnerPropertyState, uno::UNO_QUERY ); @@ -84,8 +84,8 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState Any aRet; if( xInnerPropertyState.is() ) { - aRet = xInnerPropertyState->getPropertyDefault( this->getInnerName() ); - aRet = this->convertInnerToOuterValue( aRet ); + aRet = xInnerPropertyState->getPropertyDefault( getInnerName() ); + aRet = convertInnerToOuterValue( aRet ); } return aRet; } @@ -93,7 +93,7 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; - OUString aInnerName( this->getInnerName() ); + OUString aInnerName( getInnerName() ); if( xInnerPropertyState.is() && !aInnerName.isEmpty() ) aState = xInnerPropertyState->getPropertyState( aInnerName ); else @@ -101,12 +101,12 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans:: try { Reference< beans::XPropertySet > xInnerProp( xInnerPropertyState, uno::UNO_QUERY ); - uno::Any aValue = this->getPropertyValue( xInnerProp ); + uno::Any aValue = getPropertyValue( xInnerProp ); if( !aValue.hasValue() ) aState = beans::PropertyState_DEFAULT_VALUE; else { - uno::Any aDefault = this->getPropertyDefault( xInnerPropertyState ); + uno::Any aDefault = getPropertyDefault( xInnerPropertyState ); if( aValue == aDefault ) aState = beans::PropertyState_DEFAULT_VALUE; } diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 401b63e8f35b..75aea02f3d44 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -96,7 +96,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); const WrappedProperty* pWrappedProperty = getWrappedProperty( nHandle ); - Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() ); if( pWrappedProperty ) pWrappedProperty->setPropertyValue( rValue, xInnerPropertySet ); else if( xInnerPropertySet.is() ) @@ -142,7 +142,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); const WrappedProperty* pWrappedProperty = getWrappedProperty( nHandle ); - Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() ); if( pWrappedProperty ) aRet = pWrappedProperty->getPropertyValue( xInnerPropertySet ); else if( xInnerPropertySet.is() ) @@ -177,7 +177,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) { - Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() ); if( xInnerPropertySet.is() ) { const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName ); @@ -189,7 +189,7 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr } void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener ) { - Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() ); if( xInnerPropertySet.is() ) { const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName ); @@ -201,7 +201,7 @@ void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& } void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) { - Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() ); if( xInnerPropertySet.is() ) { const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName ); @@ -213,7 +213,7 @@ void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPr } void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) { - Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); + Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() ); if( xInnerPropertySet.is() ) { const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName ); @@ -234,7 +234,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& OUString aPropertyName( rNameSeq[nN] ); try { - this->setPropertyValue( aPropertyName, rValueSeq[nN] ); + setPropertyValue( aPropertyName, rValueSeq[nN] ); } catch( const beans::UnknownPropertyException& ex ) { @@ -258,7 +258,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< try { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyValue( aPropertyName ); + aRetSeq[nN] = getPropertyValue( aPropertyName ); } catch( const beans::UnknownPropertyException& ex ) { @@ -293,7 +293,7 @@ beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUStri { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); - Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); + Reference< beans::XPropertyState > xInnerPropertyState( getInnerPropertyState() ); if( xInnerPropertyState.is() ) { const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName ); @@ -328,7 +328,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyState( aPropertyName ); + aRetSeq[nN] = getPropertyState( aPropertyName ); } } return aRetSeq; @@ -336,7 +336,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName ) { - Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); + Reference< beans::XPropertyState > xInnerPropertyState( getInnerPropertyState() ); if( xInnerPropertyState.is() ) { const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName ); @@ -349,7 +349,7 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName ) { Any aRet; - Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); + Reference< beans::XPropertyState > xInnerPropertyState( getInnerPropertyState() ); if( xInnerPropertyState.is() ) { const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName ); @@ -368,7 +368,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++) { OUString aPropertyName( rPropSeq[nN].Name ); - this->setPropertyToDefault( aPropertyName ); + setPropertyToDefault( aPropertyName ); } } void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUString >& rNameSeq ) @@ -376,7 +376,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - this->setPropertyToDefault( aPropertyName ); + setPropertyToDefault( aPropertyName ); } } Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence< OUString >& rNameSeq ) @@ -388,7 +388,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++) { OUString aPropertyName( rNameSeq[nN] ); - aRetSeq[nN] = this->getPropertyDefault( aPropertyName ); + aRetSeq[nN] = getPropertyDefault( aPropertyName ); } } return aRetSeq; |