diff options
182 files changed, 634 insertions, 634 deletions
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 9e92c2a247bb..f1805052ba41 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -97,7 +97,7 @@ void Layout::ArrangeWindows () if (bFirstSize) { bFirstSize = false; - this->OnFirstSize(nWidth, nHeight); // virtual + OnFirstSize(nWidth, nHeight); // virtual } // sides diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index d09d3cf56eae..2900ef70ac22 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -532,7 +532,7 @@ SbxDimArray& SbxDimArray::operator=( const SbxDimArray& rArray ) { SbxArray::operator=( static_cast<const SbxArray&>(rArray) ); m_vDimensions = rArray.m_vDimensions; - this->mbHasFixedSize = rArray.mbHasFixedSize; + mbHasFixedSize = rArray.mbHasFixedSize; } return *this; } 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 ) diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 58b28cd88c81..7b91f73dd2d7 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -87,24 +87,24 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32 SubTypeIndex, bool HasXAxisWit bool ChartTypeParameter::mapsToSameService( const ChartTypeParameter& rParameter ) const { - return this->mapsToSimilarService( rParameter, 0 ); + return mapsToSimilarService( rParameter, 0 ); } bool ChartTypeParameter::mapsToSimilarService( const ChartTypeParameter& rParameter, sal_Int32 nTheHigherTheLess ) const { sal_Int32 nMax=7; if(nTheHigherTheLess>nMax) return true; - if( this->bXAxisWithValues!=rParameter.bXAxisWithValues ) + if( bXAxisWithValues!=rParameter.bXAxisWithValues ) return nTheHigherTheLess>nMax-1; - if( this->b3DLook!=rParameter.b3DLook ) + if( b3DLook!=rParameter.b3DLook ) return nTheHigherTheLess>nMax-2; - if( this->eStackMode!=rParameter.eStackMode ) + if( eStackMode!=rParameter.eStackMode ) return nTheHigherTheLess>nMax-3; - if( this->nSubTypeIndex!=rParameter.nSubTypeIndex ) + if( nSubTypeIndex!=rParameter.nSubTypeIndex ) return nTheHigherTheLess>nMax-4; - if( this->bSymbols!=rParameter.bSymbols ) + if( bSymbols!=rParameter.bSymbols ) return nTheHigherTheLess>nMax-5; - if( this->bLines!=rParameter.bLines ) + if( bLines!=rParameter.bLines ) return nTheHigherTheLess>nMax-6; return true; } @@ -124,7 +124,7 @@ Image ChartTypeDialogController::getImage() } bool ChartTypeDialogController::isSubType( const OUString& rServiceName ) { - const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap(); + const tTemplateServiceChartTypeParameterMap& rTemplateMap = getTemplateMap(); tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName )); return aIt != rTemplateMap.end(); } @@ -133,7 +133,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( , const uno::Reference< beans::XPropertySet >& xTemplateProps ) { ChartTypeParameter aRet; - const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap(); + const tTemplateServiceChartTypeParameterMap& rTemplateMap = getTemplateMap(); tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName )); if( aIt != rTemplateMap.end()) aRet = (*aIt).second; @@ -275,7 +275,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla { uno::Reference< XChartTypeTemplate > xTemplate(nullptr); - OUString aServiceName( this->getServiceNameForParameter( rParameter ) ); + OUString aServiceName( getServiceNameForParameter( rParameter ) ); if(!aServiceName.isEmpty()) { xTemplate.set( xTemplateManager->createInstance( aServiceName ), uno::UNO_QUERY ); @@ -315,7 +315,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla try { - this->setTemplateProperties( xTemplateProps ); + setTemplateProperties( xTemplateProps ); } catch( const uno::Exception & ex ) { @@ -331,7 +331,7 @@ void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame , const uno::Reference< XChartDocument >& xChartModel ) { uno::Reference< lang::XMultiServiceFactory > xTemplateManager( xChartModel->getChartTypeManager(), uno::UNO_QUERY ); - uno::Reference< XChartTypeTemplate > xTemplate( this->getCurrentTemplate( rParameter, xTemplateManager ) ); + uno::Reference< XChartTypeTemplate > xTemplate( getCurrentTemplate( rParameter, xTemplateManager ) ); if(xTemplate.is()) { uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY); diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index bff4b4f2c6d6..b9ef8f7c6129 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -1275,13 +1275,13 @@ void DataBrowser::RenewSeriesHeaders() void DataBrowser::ImplAdjustHeaderControls() { - sal_uInt16 nColCount = this->GetColumnCount(); - sal_uInt32 nCurrentPos = this->GetPosPixel().getX(); - sal_uInt32 nMaxPos = nCurrentPos + this->GetOutputSizePixel().getWidth(); + sal_uInt16 nColCount = GetColumnCount(); + sal_uInt32 nCurrentPos = GetPosPixel().getX(); + sal_uInt32 nMaxPos = nCurrentPos + GetOutputSizePixel().getWidth(); sal_uInt32 nStartPos = nCurrentPos; // width of header column - nCurrentPos += this->GetColumnWidth( 0 ); + nCurrentPos += GetColumnWidth( 0 ); Dialog* pDialog = GetParentDialog(); vcl::Window* pWin = pDialog->get<VclContainer>("columns"); @@ -1301,7 +1301,7 @@ void DataBrowser::ImplAdjustHeaderControls() if( (*aIt)->GetStartColumn() == i ) nStartPos = nCurrentPos; - nCurrentPos += (this->GetColumnWidth( i )); + nCurrentPos += (GetColumnWidth( i )); if( (*aIt)->GetEndColumn() == i ) { diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 892c9a46003d..52ed6c38f767 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -47,11 +47,11 @@ void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChar //get possibilities uno::Sequence< sal_Bool > aAxisPossibilityList; AxisHelper::getAxisOrGridPossibilities( aAxisPossibilityList, xDiagram ); - this->aPossibilityList[2]=aAxisPossibilityList[0];//x axis title - this->aPossibilityList[3]=aAxisPossibilityList[1];//y axis title - this->aPossibilityList[4]=aAxisPossibilityList[2];//z axis title - this->aPossibilityList[5]=aAxisPossibilityList[3];//secondary x axis title - this->aPossibilityList[6]=aAxisPossibilityList[4];//secondary y axis title + aPossibilityList[2]=aAxisPossibilityList[0];//x axis title + aPossibilityList[3]=aAxisPossibilityList[1];//y axis title + aPossibilityList[4]=aAxisPossibilityList[2];//z axis title + aPossibilityList[5]=aAxisPossibilityList[3];//secondary x axis title + aPossibilityList[6]=aAxisPossibilityList[4];//secondary y axis title //find out which title exists and get their text //main title: @@ -61,8 +61,8 @@ void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChar { uno::Reference< XTitle > xTitle = TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nTitleIndex ), xChartModel ); - this->aExistenceList[nTitleIndex] = xTitle.is(); - this->aTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle ); + aExistenceList[nTitleIndex] = xTitle.is(); + aTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle ); } } @@ -76,12 +76,12 @@ bool TitleDialogData::writeDifferenceToModel( nN < static_cast< sal_Int32 >( TitleHelper::NORMAL_TITLE_END ); nN++) { - if( !pOldState || ( pOldState->aExistenceList[nN] != this->aExistenceList[nN] ) ) + if( !pOldState || ( pOldState->aExistenceList[nN] != aExistenceList[nN] ) ) { - if(this->aExistenceList[nN]) + if(aExistenceList[nN]) { TitleHelper::createTitle( - static_cast< TitleHelper::eTitleType >( nN ), this->aTextList[nN], xChartModel, xContext, + static_cast< TitleHelper::eTitleType >( nN ), aTextList[nN], xChartModel, xContext, apReferenceSizeProvider.get() ); bChanged = true; } @@ -91,14 +91,14 @@ bool TitleDialogData::writeDifferenceToModel( bChanged = true; } } - else if( !pOldState || ( pOldState->aTextList[nN] != this->aTextList[nN] ) ) + else if( !pOldState || ( pOldState->aTextList[nN] != aTextList[nN] ) ) { //change content uno::Reference< XTitle > xTitle( TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ) ); if(xTitle.is()) { - TitleHelper::setCompleteString( this->aTextList[nN], xTitle, xContext ); + TitleHelper::setCompleteString( aTextList[nN], xTitle, xContext ); bChanged = true; } } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 180af39f4b56..97f7d6030208 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -58,7 +58,7 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame: m_pDialogModel.reset(new DialogModel(m_xChartModel, m_xComponentContext)); defaultButton(WizardButtonFlags::FINISH); - this->setTitleBase(SchResId(STR_DLG_CHART_WIZARD)); + setTitleBase(SchResId(STR_DLG_CHART_WIZARD)); WizardPath aPath = { STATE_CHARTTYPE, @@ -69,13 +69,13 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame: declarePath(PATH_FULL, aPath); - this->SetRoadmapHelpId(HID_SCH_WIZARD_ROADMAP); - this->SetRoadmapInteractive(true); + SetRoadmapHelpId(HID_SCH_WIZARD_ROADMAP); + SetRoadmapInteractive(true); Size aAdditionalRoadmapSize(LogicToPixel(Size(85, 0), MapUnit::MapAppFont)); Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MapUnit::MapAppFont)); aSize.Width() += aAdditionalRoadmapSize.Width(); - this->SetSizePixel(aSize); + SetSizePixel(aSize); if (!m_pDialogModel->getModel().isDataFromSpreadsheet()) { diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 5cf894f2313c..38873290091e 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -52,7 +52,7 @@ InsertErrorBarsDialog::InsertErrorBarsDialog( { ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X; - this->SetText( ObjectNameProvider::getName_ObjectForAllSeries(objType) ); + SetText( ObjectNameProvider::getName_ObjectForAllSeries(objType) ); m_apErrorBarResources->SetChartDocumentForRangeChoosing( xChartDocument ); } diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 07d8e5564dde..1a48ef5125ca 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -338,7 +338,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier ); m_pNumberFormatter = aNumberFormatterWrapper.getSvNumberFormatter(); - this->SetText( pDialogParameter->getLocalizedName() ); + SetText( pDialogParameter->getLocalizedName() ); SvtCJKOptions aCJKOptions; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index f691d7cc5f68..7f9d4fe106c6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, lcl_selectColor( *m_pLB_AmbientLight, lcl_getAmbientColor( m_xSceneProperties )); - this->updatePreview(); + updatePreview(); } void ThreeD_SceneIllumination_TabPage::applyLightSourceToModel( sal_uInt32 nLightNumber ) @@ -449,7 +449,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, SvxColorListBox&, r applyLightSourceToModel( nL ); } } - this->updatePreview(); + updatePreview(); } IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void ) @@ -495,7 +495,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, { lcl_selectColor( *m_pLB_LightSource, pInfo->aLightSource.nDiffuseColor ); } - this->updatePreview(); + updatePreview(); } void ThreeD_SceneIllumination_TabPage::updatePreview() diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 7228effb0e49..795571f6e569 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -334,7 +334,7 @@ SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent ) get(m_pFT_SplineOrder, "PolynomialsLabel"); get(m_pMF_SplineOrder, "PolynomialsSpinButton"); - this->SetText( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ); + SetText( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ); m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) ); } @@ -692,7 +692,7 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent m_pFT_ChooseType->SetStyle(m_pFT_ChooseType->GetStyle() | WB_NOLABEL); } - this->SetText( SchResId(STR_PAGE_CHARTTYPE) ); + SetText( SchResId(STR_PAGE_CHARTTYPE) ); m_pMainTypeList->SetStyle(m_pMainTypeList->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK ); m_pMainTypeList->SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) ); @@ -817,7 +817,7 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ ) return; m_nChangingCalls++; - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); if( m_pCurrentMainType ) { m_pCurrentMainType->adjustParameterToSubType( aParameter ); @@ -838,7 +838,7 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ ) ASSERT_EXCEPTION(ex); } //the controls have to be enabled/disabled accordingly - this->fillAllControls( aParameter ); + fillAllControls( aParameter ); m_nChangingCalls--; } @@ -857,9 +857,9 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) { if( m_pCurrentMainType ) { - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); m_pCurrentMainType->adjustParameterToSubType( aParameter ); - this->fillAllControls( aParameter, false ); + fillAllControls( aParameter, false ); commitToModel( aParameter ); } } @@ -871,7 +871,7 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void) void ChartTypeTabPage::selectMainType() { - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); if( m_pCurrentMainType ) { @@ -879,10 +879,10 @@ void ChartTypeTabPage::selectMainType() m_pCurrentMainType->hideExtraControls(); } - m_pCurrentMainType = this->getSelectedMainType(); + m_pCurrentMainType = getSelectedMainType(); if( m_pCurrentMainType ) { - this->showAllControls(*m_pCurrentMainType); + showAllControls(*m_pCurrentMainType); m_pCurrentMainType->adjustParameterToMainType( aParameter ); commitToModel( aParameter ); @@ -902,8 +902,8 @@ void ChartTypeTabPage::selectMainType() ASSERT_EXCEPTION(ex); } - this->fillAllControls( aParameter ); - uno::Reference< beans::XPropertySet > xTemplateProps( this->getCurrentTemplate(), uno::UNO_QUERY ); + fillAllControls( aParameter ); + uno::Reference< beans::XPropertySet > xTemplateProps( getCurrentTemplate(), uno::UNO_QUERY ); m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps); } } @@ -967,10 +967,10 @@ void ChartTypeTabPage::initializePage() bFound = true; m_pMainTypeList->SelectEntryPos( nM ); - this->showAllControls( **aIter ); + showAllControls( **aIter ); uno::Reference< beans::XPropertySet > xTemplateProps( aTemplate.first, uno::UNO_QUERY ); ChartTypeParameter aParameter = (*aIter)->getChartTypeParameterForService( aServiceName, xTemplateProps ); - m_pCurrentMainType = this->getSelectedMainType(); + m_pCurrentMainType = getSelectedMainType(); //set ThreeDLookScheme aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme( xDiagram ); @@ -987,7 +987,7 @@ void ChartTypeTabPage::initializePage() ASSERT_EXCEPTION(ex); } - this->fillAllControls( aParameter ); + fillAllControls( aParameter ); if( m_pCurrentMainType ) m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps); break; @@ -1015,7 +1015,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeTabPage::getCurrentTemplate() cons { if( m_pCurrentMainType && m_xChartModel.is() ) { - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); m_pCurrentMainType->adjustParameterToSubType( aParameter ); uno::Reference< lang::XMultiServiceFactory > xTemplateManager( m_xChartModel->getChartTypeManager(), uno::UNO_QUERY ); return m_pCurrentMainType->getCurrentTemplate( aParameter, xTemplateManager ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 14d99d672ce3..627b96aae979 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -219,7 +219,7 @@ DataSourceTabPage::DataSourceTabPage( m_pFT_CAPTION->Show(!bHideDescription); m_aFixedTextRange = m_pFT_RANGE->GetText(); - this->SetText( SchResId( STR_OBJECT_DATASERIES_PLURAL ) ); + SetText( SchResId( STR_OBJECT_DATASERIES_PLURAL ) ); // set handlers m_pLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl )); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 6879b87c34fb..c4ec2b3f24f1 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -96,7 +96,7 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent m_pFT_Caption->Show(!bHideDescription); - this->SetText( m_pFTTitle->GetText());// OH:remove later with dialog + SetText( m_pFTTitle->GetText());// OH:remove later with dialog // set defaults as long as DetectArguments does not work m_pRB_Columns->Check(); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 1898a18797b3..0c1d2255e931 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -133,7 +133,7 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut) void DrawViewWrapper::ReInit() { - OutputDevice* pOutDev = this->GetFirstOutputDevice(); + OutputDevice* pOutDev = GetFirstOutputDevice(); Size aOutputSize(100,100); if(pOutDev) aOutputSize = pOutDev->GetOutputSize(); @@ -144,13 +144,13 @@ void DrawViewWrapper::ReInit() mbGridVisible = false; mbHlplVisible = false; - this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object) + SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object) //a correct work area is at least necessary for correct values in the position and size dialog tools::Rectangle aRect(Point(0,0), aOutputSize); - this->SetWorkArea(aRect); + SetWorkArea(aRect); - this->ShowSdrPage(this->GetModel()->GetPage(0)); + ShowSdrPage(GetModel()->GetPage(0)); } DrawViewWrapper::~DrawViewWrapper() @@ -161,7 +161,7 @@ DrawViewWrapper::~DrawViewWrapper() SdrPageView* DrawViewWrapper::GetPageView() const { - SdrPageView* pSdrPageView = this->GetSdrPageView(); + SdrPageView* pSdrPageView = GetSdrPageView(); return pSdrPageView; }; @@ -226,9 +226,9 @@ void DrawViewWrapper::MarkObject( SdrObject* pObj ) if( m_pMarkHandleProvider ) bFrameDragSingles = m_pMarkHandleProvider->getFrameDragSingles(); - this->SetFrameDragSingles(bFrameDragSingles);//decide whether each single object should get handles - this->SdrView::MarkObj( pObj, this->GetPageView() ); - this->showMarkHandles(); + SetFrameDragSingles(bFrameDragSingles);//decide whether each single object should get handles + SdrView::MarkObj( pObj, GetPageView() ); + showMarkHandles(); } void DrawViewWrapper::setMarkHandleProvider( MarkHandleProvider* pMarkHandleProvider ) @@ -240,14 +240,14 @@ void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg { svtools::ColorConfig aColorConfig; Color aFillColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); - this->SetApplicationBackgroundColor(aFillColor); - this->E3dView::CompleteRedraw( pOut, rReg ); + SetApplicationBackgroundColor(aFillColor); + E3dView::CompleteRedraw( pOut, rReg ); } SdrObject* DrawViewWrapper::getSelectedObject() const { SdrObject* pObj(nullptr); - const SdrMarkList& rMarkList = this->GetMarkedObjectList(); + const SdrMarkList& rMarkList = GetMarkedObjectList(); if(rMarkList.GetMarkCount() == 1) { SdrMark* pMark = rMarkList.GetMark(0); @@ -258,7 +258,7 @@ SdrObject* DrawViewWrapper::getSelectedObject() const SdrObject* DrawViewWrapper::getTextEditObject() const { - SdrObject* pObj = this->getSelectedObject(); + SdrObject* pObj = getSelectedObject(); SdrObject* pTextObj = nullptr; if( pObj && pObj->HasTextEdit()) pTextObj = static_cast<SdrTextObj*>(pObj); @@ -299,7 +299,7 @@ SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const { if(rName.isEmpty()) return nullptr; - SdrPageView* pSdrPageView = this->GetPageView(); + SdrPageView* pSdrPageView = GetPageView(); if( pSdrPageView ) { return DrawModelWrapper::getNamedSdrObject( rName, pSdrPageView->GetObjList() ); @@ -320,14 +320,14 @@ bool DrawViewWrapper::IsObjectHit( SdrObject const * pObj, const Point& rPnt ) void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { //prevent wrong reselection of objects - SdrModel* pSdrModel( this->GetModel() ); + SdrModel* pSdrModel( GetModel() ); if( pSdrModel && pSdrModel->isLocked() ) return; const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint ); //#i76053# do nothing when only changes on the hidden draw page were made ( e.g. when the symbols for the dialogs are created ) - SdrPageView* pSdrPageView = this->GetPageView(); + SdrPageView* pSdrPageView = GetPageView(); if( pSdrHint && pSdrPageView ) { if( pSdrPageView->GetPage() != pSdrHint->GetPage() ) @@ -343,7 +343,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { // #i79965# remember map mode OSL_ASSERT( ! m_bRestoreMapMode ); - OutputDevice* pOutDev = this->GetFirstOutputDevice(); + OutputDevice* pOutDev = GetFirstOutputDevice(); if( pOutDev ) { m_aMapModeToRestore = pOutDev->GetMapMode(); @@ -356,7 +356,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) OSL_ASSERT( m_bRestoreMapMode ); if( m_bRestoreMapMode ) { - OutputDevice* pOutDev = this->GetFirstOutputDevice(); + OutputDevice* pOutDev = GetFirstOutputDevice(); if( pOutDev ) { pOutDev->SetMapMode( m_aMapModeToRestore ); diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 34d983605907..5b66bf5e018e 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -146,7 +146,7 @@ SdrObjList* ViewElementListProvider::GetSymbolList() const Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, const SfxItemSet* pSymbolShapeProperties ) const { - SdrObjList* pSymbolList = this->GetSymbolList(); + SdrObjList* pSymbolList = GetSymbolList(); if( !pSymbolList->GetObjCount() ) return Graphic(); if(nStandardSymbol<0) diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx index 9befc3810665..b8e284827136 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx @@ -47,7 +47,7 @@ void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const } for( ; aIter != aEnd; ++aIter ) { - SfxItemSet aSet = this->CreateEmptyItemSet(); + SfxItemSet aSet = CreateEmptyItemSet(); (*aIter)->FillItemSet( aSet ); InvalidateUnequalItems( rOutItemSet, aSet ); } diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index ab8189642b36..2135ae701eee 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; void ChartController::executeDispatch_EditText( const Point* pMousePixel ) { - this->StartTextEdit( pMousePixel ); + StartTextEdit( pMousePixel ); } void ChartController::StartTextEdit( const Point* pMousePixel ) @@ -154,7 +154,7 @@ void ChartController::executeDispatch_InsertSpecialCharacter() return; } if( !m_pDrawViewWrapper->IsTextEdit() ) - this->StartTextEdit(); + StartTextEdit(); SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE( pFact, "No dialog factory" ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 68b85a0b65a8..36c6a569985e 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -334,7 +334,7 @@ void ChartController::impl_PasteGraphic( // note: the XPropertySet of the model is the old API. Also the property // "AdditionalShapes" that is used there. uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY ); - DrawModelWrapper * pDrawModelWrapper( this->GetDrawModelWrapper()); + DrawModelWrapper * pDrawModelWrapper( GetDrawModelWrapper()); if( ! (xGraphic.is() && xModelProp.is())) return; uno::Reference< lang::XMultiServiceFactory > xFact( pDrawModelWrapper->getShapeFactory()); @@ -377,7 +377,7 @@ void ChartController::impl_PasteGraphic( void ChartController::impl_PasteShapes( SdrModel* pModel ) { - DrawModelWrapper* pDrawModelWrapper( this->GetDrawModelWrapper() ); + DrawModelWrapper* pDrawModelWrapper( GetDrawModelWrapper() ); if ( pDrawModelWrapper && m_pDrawViewWrapper ) { Reference< drawing::XDrawPage > xDestPage( pDrawModelWrapper->getMainDrawPage() ); @@ -433,7 +433,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel ) void ChartController::impl_PasteStringAsTextShape( const OUString& rString, const awt::Point& rPosition ) { - DrawModelWrapper* pDrawModelWrapper( this->GetDrawModelWrapper() ); + DrawModelWrapper* pDrawModelWrapper( GetDrawModelWrapper() ); if ( pDrawModelWrapper && m_pDrawViewWrapper ) { const Reference< lang::XMultiServiceFactory >& xShapeFactory( pDrawModelWrapper->getShapeFactory() ); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index dbbccd268591..c05c56af059d 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -524,7 +524,7 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl, Timer *, void) if( !m_bWaitingForMouseUp && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() ) { - this->impl_selectObjectAndNotiy(); + impl_selectObjectAndNotiy(); SolarMutexGuard aGuard; auto pChartWindow(GetChartWindow()); if( pChartWindow ) @@ -592,7 +592,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) } else { - this->EndTextEdit(); + EndTextEdit(); } } @@ -882,7 +882,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) if( !m_bWaitingForDoubleClick && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() ) { - this->impl_selectObjectAndNotiy(); + impl_selectObjectAndNotiy(); } } else @@ -1308,7 +1308,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) bReturn = true; if( nCode == KEY_ESCAPE ) { - this->EndTextEdit(); + EndTextEdit(); } } } @@ -1616,9 +1616,9 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection ) SolarMutexGuard aGuard; if ( m_pDrawViewWrapper && m_pDrawViewWrapper->IsTextEdit() ) { - this->EndTextEdit(); + EndTextEdit(); } - this->impl_selectObjectAndNotiy(); + impl_selectObjectAndNotiy(); auto pChartWindow(GetChartWindow()); if ( pChartWindow ) { diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index c35cf55a067e..b03f10164b17 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -57,8 +57,8 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi #endif { set_id("chart_window"); - this->SetHelpId( HID_SCH_WIN_DOCUMENT ); - this->SetMapMode( MapMode(MapUnit::Map100thMM) ); + SetHelpId( HID_SCH_WIN_DOCUMENT ); + SetMapMode( MapMode(MapUnit::Map100thMM) ); adjustHighContrastMode(); // chart does not depend on exact pixel painting => enable antialiased drawing SetAntialiasing( AntialiasingFlags::EnableB2dDraw | GetAntialiasing() ); diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 8271118a2e6f..4e831cfc4d5e 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -110,7 +110,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/) try { - Reference< frame::XModel > xChartModel( this->getChartModel() ); + Reference< frame::XModel > xChartModel( getChartModel() ); if( xChartModel.is() ) { Reference< beans::XPropertySet > xPointProperties( diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 3dbfa1810cd4..3afb0008ad5c 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -73,7 +73,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr m_aWireframePolyPolygon = m_pScene->CreateWireframe(); - uno::Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram(this->getChartModel()) ); + uno::Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram(getChartModel()) ); uno::Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY ); if( xDiagramProperties.is() ) { @@ -161,12 +161,12 @@ bool DragMethod_RotateDiagram::EndSdrDrag(bool /*bCopy*/) if(m_bRightAngledAxes) ThreeDHelper::adaptRadAnglesForRightAngledAxes( fResultX, fResultY ); - ThreeDHelper::setRotationAngleToDiagram( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( this->getChartModel() ), uno::UNO_QUERY ) + ThreeDHelper::setRotationAngleToDiagram( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( getChartModel() ), uno::UNO_QUERY ) , fResultX, fResultY, fResultZ ); } else { - ThreeDHelper::setRotationToDiagram( ( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( this->getChartModel() ), uno::UNO_QUERY ) ) + ThreeDHelper::setRotationToDiagram( ( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( getChartModel() ), uno::UNO_QUERY ) ) , m_nInitialHorizontalAngleDegree+m_nAdditionalHorizontalAngleDegree, m_nInitialVerticalAngleDegree+m_nAdditionalVerticalAngleDegree ); } diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index f5d9c854b94f..f6043b0d5cdc 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -230,7 +230,7 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( OSL_ASSERT( m_aAllAxis.size() == static_cast< size_t >( getDimension())); - if( nAxisIndex < 0 || nAxisIndex > this->getMaximumAxisIndexByDimension(nDimensionIndex) ) + if( nAxisIndex < 0 || nAxisIndex > getMaximumAxisIndexByDimension(nDimensionIndex) ) throw lang::IndexOutOfBoundsException(); return m_aAllAxis[ nDimensionIndex ][nAxisIndex]; diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index a73aa04f49ef..c0289c3af548 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -887,7 +887,7 @@ Reference< chart2::data::XRangeHighlighter > SAL_CALL ChartModel::getRangeHighli { if( ! m_xRangeHighlighter.is()) { - uno::Reference< view::XSelectionSupplier > xSelSupp( this->getCurrentController(), uno::UNO_QUERY ); + uno::Reference< view::XSelectionSupplier > xSelSupp( getCurrentController(), uno::UNO_QUERY ); if( xSelSupp.is() ) m_xRangeHighlighter.set( ChartModelHelper::createRangeHighlighter( xSelSupp )); } @@ -1036,7 +1036,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio //get view from old api wrapper Reference< datatransfer::XTransferable > xTransferable( - this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); + createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); if( xTransferable.is() ) { datatransfer::DataFlavor aDataFlavor( lcl_aGDIMetaFileMIMEType, @@ -1071,13 +1071,13 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& aFlavor ) { uno::Any aResult; - if( this->isDataFlavorSupported( aFlavor )) + if( isDataFlavorSupported( aFlavor )) { try { //get view from old api wrapper Reference< datatransfer::XTransferable > xTransferable( - this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); + createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); if( xTransferable.is() && xTransferable->isDataFlavorSupported( aFlavor )) { @@ -1289,7 +1289,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM OUString SAL_CALL ChartModel::dump() { uno::Reference< qa::XDumper > xDumper( - this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); + createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); if (xDumper.is()) return xDumper->dump(); diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index ec3e3cfe292d..b61911bc1eed 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -188,7 +188,7 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( { uno::Any aOldValue; Reference< util::XModifyBroadcaster > xBroadcaster; - this->getFastPropertyValue( aOldValue, nHandle ); + getFastPropertyValue( aOldValue, nHandle ); if( aOldValue.hasValue() && (aOldValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 6eebded278cb..0df608770e26 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -276,7 +276,7 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( { uno::Any aOldValue; Reference< util::XModifyBroadcaster > xBroadcaster; - this->getFastPropertyValue( aOldValue, nHandle ); + getFastPropertyValue( aOldValue, nHandle ); if( aOldValue.hasValue() && (aOldValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 85eb2d5c7724..cf176a1e153e 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -257,7 +257,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( { //apply Geometry3D uno::Any aAGeometry3D; - this->getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D ); + getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Geometry3D", aAGeometry3D ); } catch( const uno::Exception & ex ) diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 32cae2fa556c..99f3de05a8e3 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -296,7 +296,7 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( { uno::Any aOldValue; Reference< util::XModifyBroadcaster > xBroadcaster; - this->getFastPropertyValue( aOldValue, nHandle ); + getFastPropertyValue( aOldValue, nHandle ); if( aOldValue.hasValue() && (aOldValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index a6b182c2497d..d3b9e2bfab86 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -178,7 +178,7 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XData m_bNotifyChanges = false; try { - Sequence< Reference< chart2::XDataSeries > > aOldSeries( this->getDataSeries() ); + Sequence< Reference< chart2::XDataSeries > > aOldSeries( getDataSeries() ); for( sal_Int32 nN=0; nN<aOldSeries.getLength(); ++nN ) ModifyListenerHelper::removeListener( aOldSeries[nN], m_xModifyEventForwarder ); m_aDataSeries.clear(); diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 4cf0c415e207..9f7c559617db 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -459,11 +459,11 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( const OUString aOffsetPropName( "Offset" ); // get offset mode chart2::PieChartOffsetMode ePieOffsetMode; - this->getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode; + getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode; // get default offset double fDefaultOffset = 0.5; - this->getFastPropertyValue( PROP_PIE_TEMPLATE_DEFAULT_OFFSET ) >>= fDefaultOffset; + getFastPropertyValue( PROP_PIE_TEMPLATE_DEFAULT_OFFSET ) >>= fDefaultOffset; double fOffsetToSet = fDefaultOffset; uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; 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; diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 901242455252..60a8d4bcf167 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -210,7 +210,7 @@ void TickFactory2D::addPointSequenceForTickLine( drawing::PointSequenceSequence& if( fInnerDirectionSign==0.0 ) fInnerDirectionSign = 1.0; - B2DVector aTickScreenPosition = this->getTickScreenPosition2D(fScaledLogicTickValue); + B2DVector aTickScreenPosition = getTickScreenPosition2D(fScaledLogicTickValue); if( bPlaceAtLabels ) aTickScreenPosition += m_aAxisLineToLabelLineShift; @@ -305,7 +305,7 @@ void TickFactory2D::updateScreenValues( TickInfoArraysType& rAllTickInfos ) cons { TickInfo& rTickInfo = (*aTickIter); rTickInfo.aTickScreenPosition = - this->getTickScreenPosition2D( rTickInfo.fScaledTickValue ); + getTickScreenPosition2D( rTickInfo.fScaledTickValue ); } } } diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index df37b2ef07fd..e22faf768011 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -146,7 +146,7 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno:: if(!pfNextParentTick) return; - sal_Int32 nMaxSubTickCount = this->getMaxTickCount( nDepth ); + sal_Int32 nMaxSubTickCount = getMaxTickCount( nDepth ); if(!nMaxSubTickCount) return; @@ -159,7 +159,7 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno:: { for( sal_Int32 nPartTick = 1; nPartTick<nIntervalCount; nPartTick++ ) { - pValue = this->getMinorTick( nPartTick, nDepth + pValue = getMinorTick( nPartTick, nDepth , fLastParentTick, *pfNextParentTick ); if(!pValue) continue; @@ -311,8 +311,8 @@ bool EquidistantTickFactory::isVisible( double fScaledValue ) const void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) const { //create point sequences for each tick depth - sal_Int32 nDepthCount = this->getTickDepth(); - sal_Int32 nMaxMajorTickCount = this->getMaxTickCount(0); + sal_Int32 nDepthCount = getTickDepth(); + sal_Int32 nMaxMajorTickCount = getMaxTickCount(0); if (nDepthCount <= 0 || nMaxMajorTickCount <= 0) return; @@ -323,7 +323,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co sal_Int32 nRealMajorTickCount = 0; for( sal_Int32 nMajorTick=0; nMajorTick<nMaxMajorTickCount; nMajorTick++ ) { - double* pValue = this->getMajorTick( nMajorTick ); + double* pValue = getMajorTick( nMajorTick ); if(!pValue) continue; aAllTicks[0][nRealMajorTickCount] = *pValue; @@ -334,7 +334,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co aAllTicks[0].realloc(nRealMajorTickCount); if(nDepthCount>0) - this->addSubTicks( 1, aAllTicks ); + addSubTicks( 1, aAllTicks ); //so far we have added all ticks between the outer major tick marks //this was necessary to create sub ticks correctly diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 59ed66cdc917..2f48b1c8facf 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -152,7 +152,7 @@ void VAxisBase::setExplicitScaleAndIncrement( void VAxisBase::createAllTickInfos( TickInfoArraysType& rAllTickInfos ) { - std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() ); + std::unique_ptr< TickFactory > apTickFactory( createTickFactory() ); if( m_aScale.ShiftedCategoryPosition ) apTickFactory->getAllTicksShifted( rAllTickInfos ); else @@ -178,7 +178,7 @@ bool VAxisBase::prepareShapeCreation() return true; //create named group shape - m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); + m_xGroupShape_Shapes = createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); if( m_aAxisProperties.m_bDisplayLabels ) m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget, m_aCID ); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index f791d065a126..43ef2d33ea12 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -273,7 +273,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty void AxisProperties::init( bool bCartesian ) { uno::Reference< beans::XPropertySet > xProp = - uno::Reference<beans::XPropertySet>::query( this->m_xAxisModel ); + uno::Reference<beans::XPropertySet>::query( m_xAxisModel ); if( !xProp.is() ) return; @@ -347,11 +347,11 @@ void AxisProperties::init( bool bCartesian ) else if(m_nMajorTickmarks!=0) nMaxDepth=1; - this->m_aTickmarkPropertiesList.clear(); + m_aTickmarkPropertiesList.clear(); for( sal_Int32 nDepth=0; nDepth<nMaxDepth; nDepth++ ) { - TickmarkProperties aTickmarkProperties = this->makeTickmarkProperties( nDepth ); - this->m_aTickmarkPropertiesList.push_back( aTickmarkProperties ); + TickmarkProperties aTickmarkProperties = makeTickmarkProperties( nDepth ); + m_aTickmarkPropertiesList.push_back( aTickmarkProperties ); } } catch( const uno::Exception& e ) @@ -382,26 +382,26 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel ) { try { - xProp->getPropertyValue( "TextBreak" ) >>= this->bLineBreakAllowed; - xProp->getPropertyValue( "TextOverlap" ) >>= this->bOverlapAllowed; - xProp->getPropertyValue( "StackCharacters" ) >>= this->bStackCharacters; - xProp->getPropertyValue( "TextRotation" ) >>= this->fRotationAngleDegree; + xProp->getPropertyValue( "TextBreak" ) >>= bLineBreakAllowed; + xProp->getPropertyValue( "TextOverlap" ) >>= bOverlapAllowed; + xProp->getPropertyValue( "StackCharacters" ) >>= bStackCharacters; + xProp->getPropertyValue( "TextRotation" ) >>= fRotationAngleDegree; css::chart::ChartAxisArrangeOrderType eArrangeOrder; xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder; switch(eArrangeOrder) { case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: - this->eStaggering = SIDE_BY_SIDE; + eStaggering = SIDE_BY_SIDE; break; case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN: - this->eStaggering = STAGGER_EVEN; + eStaggering = STAGGER_EVEN; break; case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD: - this->eStaggering = STAGGER_ODD; + eStaggering = STAGGER_ODD; break; default: - this->eStaggering = STAGGER_AUTO; + eStaggering = STAGGER_AUTO; break; } } diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 63d50e40e172..d5429ac3ff59 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1560,7 +1560,7 @@ void VCartesianAxis::createLabels() if (!m_aAxisProperties.m_bDisplayLabels) return; - std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() ); + std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() ); TickFactory2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; @@ -1614,7 +1614,7 @@ void VCartesianAxis::createMaximumLabels() if (!m_aAxisProperties.m_bDisplayLabels) return; - std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() ); + std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() ); TickFactory2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; @@ -1651,7 +1651,7 @@ void VCartesianAxis::updatePositions() if (!m_aAxisProperties.m_bDisplayLabels) return; - std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() ); + std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() ); TickFactory2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; @@ -1752,7 +1752,7 @@ void VCartesianAxis::createShapes() if( !prepareShapeCreation() ) return; - std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() ); + std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() ); TickFactory2D* pTickFactory2D = apTickFactory2D.get(); if( !pTickFactory2D ) return; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 9321ec109678..091d61718a60 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -67,7 +67,7 @@ void VCartesianCoordinateSystem::createGridShapes() return; sal_Int32 nDimensionCount = m_xCooSysModel->getDimension(); - bool bSwapXAndY = this->getPropertySwapXAndYAxis(); + bool bSwapXAndY = getPropertySwapXAndYAxis(); for( sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++) { @@ -77,15 +77,15 @@ void VCartesianCoordinateSystem::createGridShapes() continue; VCartesianGrid aGrid(nDimensionIndex,nDimensionCount, getGridListFromAxis( xAxis )); - aGrid.setExplicitScaleAndIncrement( this->getExplicitScale(nDimensionIndex,nAxisIndex) - , this->getExplicitIncrement(nDimensionIndex,nAxisIndex) ); + aGrid.setExplicitScaleAndIncrement( getExplicitScale(nDimensionIndex,nAxisIndex) + , getExplicitIncrement(nDimensionIndex,nAxisIndex) ); aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos ); aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory - , this->createCIDForGrid( nDimensionIndex,nAxisIndex ) ); + , createCIDForGrid( nDimensionIndex,nAxisIndex ) ); if(nDimensionCount==2) aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - aGrid.setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); + aGrid.setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); aGrid.createShapes(); } } @@ -104,7 +104,7 @@ void VCartesianCoordinateSystem::createVAxisList( m_aAxisMap.clear(); sal_Int32 nDimensionCount = m_xCooSysModel->getDimension(); - bool bSwapXAndY = this->getPropertySwapXAndYAxis(); + bool bSwapXAndY = getPropertySwapXAndYAxis(); if(nDimensionCount<=0) return; @@ -118,11 +118,11 @@ void VCartesianCoordinateSystem::createVAxisList( sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex); for( sal_Int32 nAxisIndex = 0; nAxisIndex <= nMaxAxisIndex; nAxisIndex++ ) { - Reference< XAxis > xAxis = this->getAxisByDimension(nDimensionIndex,nAxisIndex); + Reference< XAxis > xAxis = getAxisByDimension(nDimensionIndex,nAxisIndex); if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - AxisProperties aAxisProperties(xAxis,this->getExplicitCategoriesProvider()); + AxisProperties aAxisProperties(xAxis,getExplicitCategoriesProvider()); aAxisProperties.m_nDimensionIndex = nDimensionIndex; aAxisProperties.m_bSwapXAndY = bSwapXAndY; aAxisProperties.m_bIsMainAxis = (nAxisIndex==0); @@ -146,7 +146,7 @@ void VCartesianCoordinateSystem::createVAxisList( } aAxisProperties.init(true); if(aAxisProperties.m_bDisplayLabels) - aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc); + aAxisProperties.m_nNumberFormatKey = getNumberFormatKeyForAxis(xAxis, xChartDoc); std::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) ); tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex ); @@ -164,7 +164,7 @@ void VCartesianCoordinateSystem::initVAxisInList() return; sal_Int32 nDimensionCount = m_xCooSysModel->getDimension(); - bool bSwapXAndY = this->getPropertySwapXAndYAxis(); + bool bSwapXAndY = getPropertySwapXAndYAxis(); tVAxisMap::iterator aIt( m_aAxisMap.begin() ); tVAxisMap::const_iterator aEnd( m_aAxisMap.end() ); @@ -175,12 +175,12 @@ void VCartesianCoordinateSystem::initVAxisInList() { sal_Int32 nDimensionIndex = aIt->first.first; sal_Int32 nAxisIndex = aIt->first.second; - pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) ); + pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement( nDimensionIndex, nAxisIndex ) ); pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory - , this->createCIDForAxis( nDimensionIndex, nAxisIndex ) ); + , createCIDForAxis( nDimensionIndex, nAxisIndex ) ); if(nDimensionCount==2) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); + pVAxis->setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); } } } @@ -191,7 +191,7 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes() return; sal_Int32 nDimensionCount = m_xCooSysModel->getDimension(); - bool bSwapXAndY = this->getPropertySwapXAndYAxis(); + bool bSwapXAndY = getPropertySwapXAndYAxis(); tVAxisMap::iterator aIt( m_aAxisMap.begin() ); tVAxisMap::const_iterator aEnd( m_aAxisMap.end() ); @@ -202,10 +202,10 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes() { sal_Int32 nDimensionIndex = aIt->first.first; sal_Int32 nAxisIndex = aIt->first.second; - pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) ); + pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement( nDimensionIndex, nAxisIndex ) ); if(nDimensionCount==2) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); + pVAxis->setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY ); } } } diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 57073235c0ff..aa71888bd9f3 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -200,7 +200,7 @@ void VCartesianGrid::createShapes() //create named group shape Reference< drawing::XShapes > xGroupShape_Shapes( - this->createGroupShape( m_xLogicTarget, m_aCID ) ); + createGroupShape( m_xLogicTarget, m_aCID ) ); if(!xGroupShape_Shapes.is()) return; @@ -209,7 +209,7 @@ void VCartesianGrid::createShapes() fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList ); //create all scaled tickmark values - std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() ); + std::unique_ptr< TickFactory > apTickFactory( createTickFactory() ); TickFactory& aTickFactory = *apTickFactory.get(); TickInfoArraysType aAllTickInfos; aTickFactory.getAllTicks( aAllTickInfos ); @@ -232,7 +232,7 @@ void VCartesianGrid::createShapes() Reference< drawing::XShapes > xTarget( xGroupShape_Shapes ); if( nDepth > 0 ) { - xTarget.set( this->createGroupShape( m_xLogicTarget + xTarget.set( createGroupShape( m_xLogicTarget , ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) ) ) ); if(!xTarget.is()) diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index bf409b8341b1..741516b7159c 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -178,7 +178,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution( if( nYResolution < 10 ) nYResolution = 10; - if( this->getPropertySwapXAndYAxis() ) + if( getPropertySwapXAndYAxis() ) std::swap(nXResolution,nYResolution); //2D @@ -232,7 +232,7 @@ void VCoordinateSystem::impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex { impl_adjustDimension( rDimensionIndex ); - if( rAxisIndex < 0 || rAxisIndex > this->getMaximumAxisIndexByDimension(rDimensionIndex) ) + if( rAxisIndex < 0 || rAxisIndex > getMaximumAxisIndexByDimension(rDimensionIndex) ) rAxisIndex = 0; } @@ -251,7 +251,7 @@ std::vector< ExplicitScaleData > VCoordinateSystem::getExplicitScales( sal_Int32 std::vector< ExplicitScaleData > aRet(m_aExplicitScales); impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex ); - aRet[nDimensionIndex]=this->getExplicitScale( nDimensionIndex, nAxisIndex ); + aRet[nDimensionIndex]=getExplicitScale( nDimensionIndex, nAxisIndex ); return aRet; } @@ -261,7 +261,7 @@ std::vector< ExplicitIncrementData > VCoordinateSystem::getExplicitIncrements( s std::vector< ExplicitIncrementData > aRet(m_aExplicitIncrements); impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex ); - aRet[nDimensionIndex]=this->getExplicitIncrement( nDimensionIndex, nAxisIndex ); + aRet[nDimensionIndex]=getExplicitIncrement( nDimensionIndex, nAxisIndex ); return aRet; } diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 8d58afb19212..f8796f4a29e0 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -164,13 +164,13 @@ void VPolarAngleAxis::createLabels() if( m_aAxisProperties.m_bDisplayLabels ) { //get the transformed screen values for all tickmarks in aAllTickInfos - std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() ); + std::unique_ptr< TickFactory > apTickFactory( createTickFactory() ); //create tick mark text shapes //@todo: iterate through all tick depth which should be labeled EquidistantTickIter aTickIter( m_aAllTickInfos, m_aIncrement, 0 ); - this->updateUnscaledValuesAtTicks( aTickIter ); + updateUnscaledValuesAtTicks( aTickIter ); removeTextShapesFromTicks(); diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 732157432d21..3928b5b07c9f 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -46,7 +46,7 @@ uno::Sequence< sal_Int32 > VPolarCoordinateSystem::getCoordinateSystemResolution if( aResolution.getLength() >= 2 ) { - if( this->getPropertySwapXAndYAxis() ) + if( getPropertySwapXAndYAxis() ) { aResolution[0]/=2;//radius aResolution[1]*=4;//outer circle resolution @@ -82,13 +82,13 @@ void VPolarCoordinateSystem::createVAxisList( sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex); for( sal_Int32 nAxisIndex = 0; nAxisIndex <= nMaxAxisIndex; nAxisIndex++ ) { - Reference< XAxis > xAxis( this->getAxisByDimension(nDimensionIndex,nAxisIndex) ); + Reference< XAxis > xAxis( getAxisByDimension(nDimensionIndex,nAxisIndex) ); if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - AxisProperties aAxisProperties(xAxis,this->getExplicitCategoriesProvider()); + AxisProperties aAxisProperties(xAxis,getExplicitCategoriesProvider()); aAxisProperties.init(); if(aAxisProperties.m_bDisplayLabels) - aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc); + aAxisProperties.m_nNumberFormatKey = getNumberFormatKeyForAxis(xAxis, xChartDoc); std::shared_ptr< VAxisBase > apVAxis( VPolarAxis::createAxis( aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) ); tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex ); @@ -105,7 +105,7 @@ void VPolarCoordinateSystem::initVAxisInList() return; sal_Int32 nDimensionCount = m_xCooSysModel->getDimension(); - bool bSwapXAndY = this->getPropertySwapXAndYAxis(); + bool bSwapXAndY = getPropertySwapXAndYAxis(); tVAxisMap::iterator aIt( m_aAxisMap.begin() ); tVAxisMap::const_iterator aEnd( m_aAxisMap.end() ); @@ -116,15 +116,15 @@ void VPolarCoordinateSystem::initVAxisInList() { sal_Int32 nDimensionIndex = aIt->first.first; sal_Int32 nAxisIndex = aIt->first.second; - pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) ); + pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement(nDimensionIndex, nAxisIndex) ); pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory - , this->createCIDForAxis( nDimensionIndex, nAxisIndex ) ); + , createCIDForAxis( nDimensionIndex, nAxisIndex ) ); VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis ); if( pVPolarAxis ) - pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); + pVPolarAxis->setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); if(nDimensionCount==2) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); + pVAxis->setScales( getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); } } } @@ -135,7 +135,7 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes() return; sal_Int32 nDimensionCount = m_xCooSysModel->getDimension(); - bool bSwapXAndY = this->getPropertySwapXAndYAxis(); + bool bSwapXAndY = getPropertySwapXAndYAxis(); tVAxisMap::iterator aIt( m_aAxisMap.begin() ); tVAxisMap::const_iterator aEnd( m_aAxisMap.end() ); @@ -146,13 +146,13 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes() { sal_Int32 nDimensionIndex = aIt->first.first; sal_Int32 nAxisIndex = aIt->first.second; - pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) ); + pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement(nDimensionIndex, nAxisIndex) ); VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis ); if( pVPolarAxis ) - pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); + pVPolarAxis->setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); if(nDimensionCount==2) pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); + pVAxis->setScales( getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY ); } } } @@ -163,7 +163,7 @@ void VPolarCoordinateSystem::createGridShapes() return; sal_Int32 nDimensionCount = m_xCooSysModel->getDimension(); - bool bSwapXAndY = this->getPropertySwapXAndYAxis(); + bool bSwapXAndY = getPropertySwapXAndYAxis(); for( sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++) { @@ -174,12 +174,12 @@ void VPolarCoordinateSystem::createGridShapes() continue; VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis )); - aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); + aGrid.setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory - , this->createCIDForGrid( nDimensionIndex, nAxisIndex ) ); + , createCIDForGrid( nDimensionIndex, nAxisIndex ) ); if(nDimensionCount==2) aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen ); - aGrid.setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY ); + aGrid.setScales( getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY ); aGrid.createShapes(); } } diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 279f38c956f2..09e0d6a237f2 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -106,7 +106,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT , const std::vector<VLineProperties>& rLinePropertiesList ) { Reference< drawing::XShapes > xMainTarget( - this->createGroupShape( xLogicTarget, m_aCID ) ); + createGroupShape( xLogicTarget, m_aCID ) ); const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0]; Reference< XScaling > xInverseScaling( NULL ); @@ -160,7 +160,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic , const std::vector<VLineProperties>& rLinePropertiesList ) { Reference< drawing::XShapes > xMainTarget( - this->createGroupShape( xLogicTarget, m_aCID ) ); + createGroupShape( xLogicTarget, m_aCID ) ); const ExplicitScaleData& rRadiusScale = m_pPosHelper->getScales()[1]; const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0]; @@ -182,7 +182,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic Reference< drawing::XShapes > xTarget( xMainTarget ); if( nDepth > 0 ) { - xTarget.set( this->createGroupShape( xLogicTarget + xTarget.set( createGroupShape( xLogicTarget , ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) ) ) ); if(!xTarget.is()) @@ -238,9 +238,9 @@ void VPolarGrid::createShapes() if(m_nDimension==2) { if(m_nDimensionIndex==1) - this->create2DRadiusGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList ); + create2DRadiusGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList ); //else //no Angle Grid so far as this equals exactly the y axis positions - // this->create2DAngleGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList ); + // create2DAngleGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList ); } } diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 9ef01a23fbb2..8de84f507d43 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -414,7 +414,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries uno::Reference< drawing::XShape > xShape(nullptr); if(m_nDimension==3) { - double fDepth = this->getTransformedDepth(); + double fDepth = getTransformedDepth(); sal_Int32 nPolyCount = aPoly.SequenceX.getLength(); for(sal_Int32 nPoly=0;nPoly<nPolyCount;nPoly++) { @@ -511,7 +511,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries if(m_nDimension==3) { xShape = m_pShapeFactory->createArea3D( xSeriesGroupShape_Shapes - , aPoly, this->getTransformedDepth() ); + , aPoly, getTransformedDepth() ); } else //m_nDimension!=3 { @@ -552,7 +552,7 @@ void AreaChart::impl_createSeriesShapes() for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex(); - PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex )); + PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex )); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); PlotterBase::m_pPosHelper = pPosHelper; @@ -699,7 +699,7 @@ void AreaChart::createShapes() if( rLogicYSumMap.find(nAttachedAxisIndex)==rLogicYSumMap.end() ) rLogicYSumMap[nAttachedAxisIndex]=0.0; - PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex )); + PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex )); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); PlotterBase::m_pPosHelper = pPosHelper; @@ -737,7 +737,7 @@ void AreaChart::createShapes() uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShapeFrontChild(*aSeriesIter, m_xSeriesTarget); sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex(); - PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex )); + PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex )); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); PlotterBase::m_pPosHelper = pPosHelper; @@ -929,7 +929,7 @@ void AreaChart::createShapes() LabelAlignment eAlignment = LABEL_ALIGN_TOP; drawing::Position3D aScenePosition3D( aScenePosition.PositionX , aScenePosition.PositionY - , aScenePosition.PositionZ+this->getTransformedDepth() ); + , aScenePosition.PositionZ+getTransformedDepth() ); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() ); diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 702b90f7569c..85fd8a8bfaa5 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -85,7 +85,7 @@ drawing::Direction3D BarChart::getPreferredDiagramAspectRatio() const if( m_nDimension == 3 ) { aRet = drawing::Direction3D(1.0,-1.0,1.0); - BarPositionHelper* pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( MAIN_AXIS_INDEX) ) ); + BarPositionHelper* pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( MAIN_AXIS_INDEX) ) ); if (pPosHelper) { drawing::Direction3D aScale( pPosHelper->getScaledLogicWidth() ); @@ -498,7 +498,7 @@ void BarChart::createShapes() { nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries(); //2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot - pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) ); + pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) ); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); } @@ -874,7 +874,7 @@ void BarChart::createShapes() { sal_Int32 nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries(); //2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot - pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) ); + pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) ); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); } diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 19c278fff217..79165ade1ff6 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -235,7 +235,7 @@ void BubbleChart::createShapes() uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(*aSeriesIter, xSeriesTarget); sal_Int32 nAttachedAxisIndex = pSeries->getAttachedAxisIndex(); - PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex )); + PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex )); if(!pPosHelper) pPosHelper = m_pMainPosHelper; PlotterBase::m_pPosHelper = pPosHelper; @@ -330,7 +330,7 @@ void BubbleChart::createShapes() LabelAlignment eAlignment = LABEL_ALIGN_TOP; drawing::Position3D aScenePosition3D( aScenePosition.PositionX , aScenePosition.PositionY - , aScenePosition.PositionZ+this->getTransformedDepth() ); + , aScenePosition.PositionZ+getTransformedDepth() ); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() ); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 969fcb4550b8..294629fda718 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -151,7 +151,7 @@ void CandleStickChart::createShapes() { nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries(); //2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot - pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) ); + pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) ); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); } diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 4ed5410c0729..cf80469a70af 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -265,7 +265,7 @@ void NetChart::impl_createSeriesShapes() for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex(); - PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex )); + PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex )); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); PlotterBase::m_pPosHelper = pPosHelper; @@ -404,7 +404,7 @@ void NetChart::createShapes() if( aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() ) aLogicYSumMap[nAttachedAxisIndex]=0.0; - PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex )); + PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex )); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); PlotterBase::m_pPosHelper = pPosHelper; @@ -447,7 +447,7 @@ void NetChart::createShapes() uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShapeFrontChild(*aSeriesIter, m_xSeriesTarget); sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex(); - PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex )); + PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex )); if(!pPosHelper) pPosHelper = m_pMainPosHelper.get(); PlotterBase::m_pPosHelper = pPosHelper; @@ -617,7 +617,7 @@ void NetChart::createShapes() LabelAlignment eAlignment = LABEL_ALIGN_TOP; drawing::Position3D aScenePosition3D( aScenePosition.PositionX , aScenePosition.PositionY - , aScenePosition.PositionZ+this->getTransformedDepth() ); + , aScenePosition.PositionZ+getTransformedDepth() ); sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() ); diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 272d26ad82b6..184d824ce919 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -602,7 +602,7 @@ void PieChart::createShapes() if( !bIsVisible ) continue; - aParam.mfDepth = this->getTransformedDepth() * (n3DRelativeHeight / 100.0); + aParam.mfDepth = getTransformedDepth() * (n3DRelativeHeight / 100.0); uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries, xSeriesTarget); ///collect data point information (logic coordinates, style ): @@ -773,7 +773,7 @@ PieChart::PieLabelInfo::PieLabelInfo() bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, const awt::Size& rPageSize, bool bMoveHalfWay, bool bMoveClockwise ) { //return true if the move was successful - if(!this->bMovementAllowed) + if(!bMovementAllowed) return false; const sal_Int32 nLabelDistanceX = rPageSize.Width/50; @@ -781,7 +781,7 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c ///compute the rectangle representing the intersection of the label bounding ///boxes (`aOverlap`). - ::basegfx::B2IRectangle aOverlap( lcl_getRect( this->xLabelGroupShape ) ); + ::basegfx::B2IRectangle aOverlap( lcl_getRect( xLabelGroupShape ) ); aOverlap.intersect( lcl_getRect( pFix->xLabelGroupShape ) ); if( !aOverlap.isEmpty() ) { @@ -797,7 +797,7 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c ///`aTangentialDirection` is greater than the vertical component, ///the magnitude of the shift is equal to `aOverlap.Width` else to ///`aOverlap.Height`; - basegfx::B2IVector aRadiusDirection = this->aFirstPosition - this->aOrigin; + basegfx::B2IVector aRadiusDirection = aFirstPosition - aOrigin; aRadiusDirection.setLength(1.0); basegfx::B2IVector aTangentialDirection( -aRadiusDirection.getY(), aRadiusDirection.getX() ); bool bShiftHorizontal = abs(aTangentialDirection.getX()) > abs(aTangentialDirection.getY()); @@ -813,17 +813,17 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c ///`aTangentialDirection` is reversed; if(!bMoveClockwise) nShift*=-1; - awt::Point aOldPos( this->xLabelGroupShape->getPosition() ); + awt::Point aOldPos( xLabelGroupShape->getPosition() ); basegfx::B2IVector aNewPos = basegfx::B2IVector( aOldPos.X, aOldPos.Y ) + nShift*aTangentialDirection; ///a final check is performed in order to be sure that the moved label ///is still inside the page document; awt::Point aNewAWTPos( aNewPos.getX(), aNewPos.getY() ); - if( !lcl_isInsidePage( aNewAWTPos, this->xLabelGroupShape->getSize(), rPageSize ) ) + if( !lcl_isInsidePage( aNewAWTPos, xLabelGroupShape->getSize(), rPageSize ) ) return false; - this->xLabelGroupShape->setPosition( aNewAWTPos ); - this->bMoved = true; + xLabelGroupShape->setPosition( aNewAWTPos ); + bMoved = true; } return true; diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 589812594ff6..160fbd7f194d 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -299,9 +299,9 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getSeriesGroupShapeFrontChild if(!xShapes.is()) { //ensure that the series group shape is already created - uno::Reference< drawing::XShapes > xSeriesShapes( this->getSeriesGroupShape( pDataSeries, xTarget ) ); + uno::Reference< drawing::XShapes > xSeriesShapes( getSeriesGroupShape( pDataSeries, xTarget ) ); //ensure that the back child is created first - this->getSeriesGroupShapeBackChild( pDataSeries, xTarget ); + getSeriesGroupShapeBackChild( pDataSeries, xTarget ); //use series group shape as parent for the new created front group shape xShapes = createGroupShape( xSeriesShapes ); pDataSeries->m_xFrontSubGroupShape = xShapes; @@ -316,7 +316,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getSeriesGroupShapeBackChild( if(!xShapes.is()) { //ensure that the series group shape is already created - uno::Reference< drawing::XShapes > xSeriesShapes( this->getSeriesGroupShape( pDataSeries, xTarget ) ); + uno::Reference< drawing::XShapes > xSeriesShapes( getSeriesGroupShape( pDataSeries, xTarget ) ); //use series group shape as parent for the new created back group shape xShapes = createGroupShape( xSeriesShapes ); pDataSeries->m_xBackSubGroupShape = xShapes; @@ -350,7 +350,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VData if(!xShapes.is()) { //create a group shape for this series and add to logic target: - xShapes = this->createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) ); + xShapes = createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) ); rShapeGroup = xShapes; } return xShapes; @@ -1011,7 +1011,7 @@ void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogic if( xErrorBarProp.is()) { uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes( - this->getErrorBarsGroupShape(rVDataSeries, xTarget, false) ); + getErrorBarsGroupShape(rVDataSeries, xTarget, false) ); createErrorBar( xErrorBarsGroup_Shapes , rUnscaledLogicPosition, xErrorBarProp @@ -1033,7 +1033,7 @@ void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogic if( xErrorBarProp.is()) { uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes( - this->getErrorBarsGroupShape(rVDataSeries, xTarget, true) ); + getErrorBarsGroupShape(rVDataSeries, xTarget, true) ); createErrorBar( xErrorBarsGroup_Shapes , rUnscaledLogicPosition, xErrorBarProp @@ -1423,7 +1423,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) ) { double fMinY, fMaxY; - this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex ); + getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex ); return fMinY; } @@ -1456,7 +1456,7 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) ) { double fMinY, fMaxY; - this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex ); + getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex ); return fMaxY; } @@ -1975,7 +1975,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategoryRange( double fMinimumY; ::rtl::math::setNan(&fMinimumY); double fMaximumY; ::rtl::math::setNan(&fMaximumY); - this->calculateYMinAndMaxForCategory( nCatIndex + calculateYMinAndMaxForCategory( nCatIndex , bSeparateStackingForDifferentSigns, fMinimumY, fMaximumY, nAxisIndex ); if(rfMinimumY > fMinimumY) @@ -2133,7 +2133,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( continue; std::vector<ViewLegendEntry> aSeriesEntries( - this->createLegendEntriesForSeries( + createLegendEntriesForSeries( rEntryKeyAspectRatio, *pSeries, xTextProperties, xTarget, xShapeFactory, xContext)); @@ -2284,8 +2284,8 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries( , const Reference< lang::XMultiServiceFactory >& xShapeFactory ) { - LegendSymbolStyle eLegendSymbolStyle = this->getLegendSymbolStyle(); - uno::Any aExplicitSymbol( this->getExplicitSymbol( rSeries, -1 ) ); + LegendSymbolStyle eLegendSymbolStyle = getLegendSymbolStyle(); + uno::Any aExplicitSymbol( getExplicitSymbol( rSeries, -1 ) ); VLegendSymbolFactory::PropertyType ePropType = VLegendSymbolFactory::PropertyType::FilledSeries; @@ -2315,8 +2315,8 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint( , const Reference< lang::XMultiServiceFactory >& xShapeFactory ) { - LegendSymbolStyle eLegendSymbolStyle = this->getLegendSymbolStyle(); - uno::Any aExplicitSymbol( this->getExplicitSymbol(rSeries,nPointIndex) ); + LegendSymbolStyle eLegendSymbolStyle = getLegendSymbolStyle(); + uno::Any aExplicitSymbol( getExplicitSymbol(rSeries,nPointIndex) ); VLegendSymbolFactory::PropertyType ePropType = VLegendSymbolFactory::PropertyType::FilledSeries; @@ -2393,7 +2393,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( uno::Reference< drawing::XShapes > xSymbolGroup( AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory)->createGroup2D( xTarget )); // create the symbol - Reference< drawing::XShape > xShape( this->createLegendSymbolForPoint( rEntryKeyAspectRatio, + Reference< drawing::XShape > xShape( createLegendSymbolForPoint( rEntryKeyAspectRatio, rSeries, nIdx, xSymbolGroup, xShapeFactory ) ); // set CID to symbol for selection @@ -2422,7 +2422,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( uno::Reference< drawing::XShapes > xSymbolGroup( AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory)->createGroup2D( xTarget )); // create the symbol - Reference< drawing::XShape > xShape( this->createLegendSymbolForSeries( + Reference< drawing::XShape > xShape( createLegendSymbolForSeries( rEntryKeyAspectRatio, rSeries, xSymbolGroup, xShapeFactory ) ); // set CID to symbol for selection diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 613c4b5ac246..0eaab2eb4155 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -148,7 +148,7 @@ uno::Reference< uno::XInterface > DrawModelWrapper::createUnoModel() uno::Reference< frame::XModel > DrawModelWrapper::getUnoModel() { - uno::Reference< uno::XInterface > xI = this->SdrModel::getUnoModel(); + uno::Reference< uno::XInterface > xI = SdrModel::getUnoModel(); return uno::Reference<frame::XModel>::query( xI ); } @@ -159,7 +159,7 @@ SdrModel& DrawModelWrapper::getSdrModel() uno::Reference< lang::XMultiServiceFactory > DrawModelWrapper::getShapeFactory() { - uno::Reference< lang::XMultiServiceFactory > xShapeFactory( this->getUnoModel(), uno::UNO_QUERY ); + uno::Reference< lang::XMultiServiceFactory > xShapeFactory( getUnoModel(), uno::UNO_QUERY ); return xShapeFactory; } @@ -189,14 +189,14 @@ uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getMainDrawPage() //ensure that additional shapes are in front of the chart objects so create the chart root before // let us disable this call for now // TODO:moggi - // AbstractShapeFactory::getOrCreateShapeFactory(this->getShapeFactory())->getOrCreateChartRootShape( m_xMainDrawPage ); + // AbstractShapeFactory::getOrCreateShapeFactory(getShapeFactory())->getOrCreateChartRootShape( m_xMainDrawPage ); return m_xMainDrawPage; } uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getHiddenDrawPage() { if( !m_xHiddenDrawPage.is() ) { - uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSuplier( this->getUnoModel(), uno::UNO_QUERY ); + uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSuplier( getUnoModel(), uno::UNO_QUERY ); if( xDrawPagesSuplier.is() ) { uno::Reference< drawing::XDrawPages > xDrawPages( xDrawPagesSuplier->getDrawPages () ); @@ -240,13 +240,13 @@ uno::Reference< drawing::XShapes > DrawModelWrapper::getChartRootShape( void DrawModelWrapper::lockControllers() { - uno::Reference< frame::XModel > xDrawModel( this->getUnoModel() ); + uno::Reference< frame::XModel > xDrawModel( getUnoModel() ); if( xDrawModel.is()) xDrawModel->lockControllers(); } void DrawModelWrapper::unlockControllers() { - uno::Reference< frame::XModel > xDrawModel( this->getUnoModel() ); + uno::Reference< frame::XModel > xDrawModel( getUnoModel() ); if( xDrawModel.is()) xDrawModel->unlockControllers(); } @@ -258,36 +258,36 @@ OutputDevice* DrawModelWrapper::getReferenceDevice() const SfxItemPool& DrawModelWrapper::GetItemPool() { - return this->SdrModel::GetItemPool(); + return SdrModel::GetItemPool(); } XColorListRef DrawModelWrapper::GetColorList() const { - return this->SdrModel::GetColorList(); + return SdrModel::GetColorList(); } XDashListRef DrawModelWrapper::GetDashList() const { - return this->SdrModel::GetDashList(); + return SdrModel::GetDashList(); } XLineEndListRef DrawModelWrapper::GetLineEndList() const { - return this->SdrModel::GetLineEndList(); + return SdrModel::GetLineEndList(); } XGradientListRef DrawModelWrapper::GetGradientList() const { - return this->SdrModel::GetGradientList(); + return SdrModel::GetGradientList(); } XHatchListRef DrawModelWrapper::GetHatchList() const { - return this->SdrModel::GetHatchList(); + return SdrModel::GetHatchList(); } XBitmapListRef DrawModelWrapper::GetBitmapList() const { - return this->SdrModel::GetBitmapList(); + return SdrModel::GetBitmapList(); } XPatternListRef DrawModelWrapper::GetPatternList() const { - return this->SdrModel::GetPatternList(); + return SdrModel::GetPatternList(); } SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName ) diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index f378e32a4b73..b42346c1210a 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -87,7 +87,7 @@ PlottingPositionHelper* PlottingPositionHelper::clone() const PlottingPositionHelper* PlottingPositionHelper::createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale ) { - PlottingPositionHelper* pRet = this->clone(); + PlottingPositionHelper* pRet = clone(); pRet->m_aScales[1]=rSecondaryScale; return pRet; } @@ -175,23 +175,23 @@ uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScale drawing::Position3D PlottingPositionHelper::transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const { - this->doLogicScaling( &fX,&fY,&fZ ); + doLogicScaling( &fX,&fY,&fZ ); if(bClip) - this->clipScaledLogicValues( &fX,&fY,&fZ ); + clipScaledLogicValues( &fX,&fY,&fZ ); - return this->transformScaledLogicToScene( fX, fY, fZ, false ); + return transformScaledLogicToScene( fX, fY, fZ, false ); } drawing::Position3D PlottingPositionHelper::transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const { if( bClip ) - this->clipScaledLogicValues( &fX,&fY,&fZ ); + clipScaledLogicValues( &fX,&fY,&fZ ); drawing::Position3D aPos( fX, fY, fZ); uno::Reference< XTransformation > xTransformation = - this->getTransformationScaledLogicToScene(); + getTransformationScaledLogicToScene(); uno::Sequence< double > aSeq = xTransformation->transform( Position3DToSequence(aPos) ); return SequenceToPosition3D(aSeq); @@ -233,7 +233,7 @@ void PlottingPositionHelper::transformScaledLogicToScene( drawing::PolyPolygonSh double& fX = xValues[nP]; double& fY = yValues[nP]; double& fZ = zValues[nP]; - aScenePosition = this->transformScaledLogicToScene( fX,fY,fZ,true ); + aScenePosition = transformScaledLogicToScene( fX,fY,fZ,true ); fX = aScenePosition.PositionX; fY = aScenePosition.PositionY; fZ = aScenePosition.PositionZ; @@ -412,8 +412,8 @@ double PolarPlottingPositionHelper::getWidthAngleDegree( double& fStartLogicValu fStartLogicValueOnAngleAxis = fHelp; } - double fStartAngleDegree = this->transformToAngleDegree( fStartLogicValueOnAngleAxis ); - double fEndAngleDegree = this->transformToAngleDegree( fEndLogicValueOnAngleAxis ); + double fStartAngleDegree = transformToAngleDegree( fStartLogicValueOnAngleAxis ); + double fEndAngleDegree = transformToAngleDegree( fEndLogicValueOnAngleAxis ); double fWidthAngleDegree = fEndAngleDegree - fStartAngleDegree; if( ::rtl::math::approxEqual( fStartAngleDegree, fEndAngleDegree ) @@ -598,19 +598,19 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu drawing::Position3D PolarPlottingPositionHelper::transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const { if(bClip) - this->clipLogicValues( &fX,&fY,&fZ ); + clipLogicValues( &fX,&fY,&fZ ); double fLogicValueOnAngleAxis = m_bSwapXAndY ? fY : fX; double fLogicValueOnRadiusAxis = m_bSwapXAndY ? fX : fY; - return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ ); + return transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ ); } drawing::Position3D PolarPlottingPositionHelper::transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const { if(bClip) - this->clipScaledLogicValues( &fX,&fY,&fZ ); + clipScaledLogicValues( &fX,&fY,&fZ ); double fLogicValueOnAngleAxis = m_bSwapXAndY ? fY : fX; double fLogicValueOnRadiusAxis = m_bSwapXAndY ? fX : fY; - return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, false ); + return transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, false ); } drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( double fUnitAngleDegree, double fUnitRadius , double fLogicZ ) const @@ -629,8 +629,8 @@ drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( dou drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling ) const { - double fUnitAngleDegree = this->transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling); - double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); + double fUnitAngleDegree = transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling); + double fUnitRadius = transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ ); } diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index a5d266f545ea..d7a71d605557 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -77,7 +77,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi else fRadius = fUnitCircleInnerRadius + (fUnitCircleOuterRadius-fUnitCircleInnerRadius)/2.0 ; - awt::Point aRet( this->transformSceneToScreenPosition( + awt::Point aRet( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ+0.5 ) ) ); if(m_nDimensionCount==3 && nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE) @@ -85,10 +85,10 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi //check whether the upper or the downer edge is more distant from the center //take the farest point to put the label to - awt::Point aP0( this->transformSceneToScreenPosition( + awt::Point aP0( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( 0, 0, fLogicZ ) ) ); awt::Point aP1(aRet); - awt::Point aP2( this->transformSceneToScreenPosition( + awt::Point aP2( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ-0.5 ) ) ); ::basegfx::B2DVector aV0( aP0.X, aP0.Y ); @@ -158,7 +158,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi //add a scaling independent Offset if requested if( nScreenValueOffsetInRadiusDirection != 0) { - awt::Point aOrigin( this->transformSceneToScreenPosition( + awt::Point aOrigin( transformSceneToScreenPosition( m_pPosHelper->transformUnitCircleToScene( 0.0, 0.0, fLogicZ+0.5 ) ) ); basegfx::B2IVector aDirection( aRet.X- aOrigin.X, aRet.Y- aOrigin.Y ); aDirection.setLength(nScreenValueOffsetInRadiusDirection); diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 1c9f6061ef9b..09c8236840a9 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -572,7 +572,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce { OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); bool bHasNumberFormat = false; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); sal_Int32 nNumberFormat = -1; if( xPointProp.is() && (xPointProp->getPropertyValue(aPropName) >>= nNumberFormat) ) bHasNumberFormat = true; @@ -582,7 +582,7 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor { OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT); sal_Int32 nNumberFormat = -1; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); if( xPointProp.is() ) xPointProp->getPropertyValue(aPropName) >>= nNumberFormat; return nNumberFormat; @@ -625,7 +625,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Refe sal_Int32 nLabelPlacement=0; try { - uno::Reference< beans::XPropertySet > xPointProps( this->getPropertiesOfPoint( nPointIndex ) ); + uno::Reference< beans::XPropertySet > xPointProps( getPropertiesOfPoint( nPointIndex ) ); if( xPointProps.is() ) xPointProps->getPropertyValue("LabelPlacement") >>= nLabelPlacement; @@ -807,7 +807,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const adaptPointCache( index ); if (!m_apSymbolProperties_AttributedPoint) m_apSymbolProperties_AttributedPoint - = getSymbolPropertiesFromPropertySet(this->getPropertiesOfPoint(index)); + = getSymbolPropertiesFromPropertySet(getPropertiesOfPoint(index)); pRet = m_apSymbolProperties_AttributedPoint.get(); //if a single data point does not have symbols but the dataseries itself has symbols //we create an invisible symbol shape to enable selection of that point @@ -815,7 +815,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const { if (!m_apSymbolProperties_Series) m_apSymbolProperties_Series - = getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries()); + = getSymbolPropertiesFromPropertySet(getPropertiesOfSeries()); if( m_apSymbolProperties_Series.get() && m_apSymbolProperties_Series->Style != SymbolStyle_NONE ) { if (!m_apSymbolProperties_InvisibleSymbolForSelection) @@ -835,7 +835,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const { if (!m_apSymbolProperties_Series) m_apSymbolProperties_Series - = getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries()); + = getSymbolPropertiesFromPropertySet(getPropertiesOfSeries()); pRet = m_apSymbolProperties_Series.get(); } @@ -856,7 +856,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getXErrorBarProperties( sal_I { uno::Reference< beans::XPropertySet > xErrorBarProp; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( index )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( index )); if( xPointProp.is() ) xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp; return xErrorBarProp; @@ -866,7 +866,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getYErrorBarProperties( sal_I { uno::Reference< beans::XPropertySet > xErrorBarProp; - uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( index )); + uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( index )); if( xPointProp.is() ) xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarProp; return xErrorBarProp; @@ -879,7 +879,7 @@ bool VDataSeries::hasPointOwnColor( sal_Int32 index ) const try { - uno::Reference< beans::XPropertyState > xPointState( this->getPropertiesOfPoint(index), uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertyState > xPointState( getPropertiesOfPoint(index), uno::UNO_QUERY_THROW ); return (xPointState->getPropertyState("Color") != beans::PropertyState_DEFAULT_VALUE ); } catch(const uno::Exception& e) @@ -905,7 +905,7 @@ bool VDataSeries::isAttributedDataPoint( sal_Int32 index ) const bool VDataSeries::isVaryColorsByPoint() const { bool bVaryColorsByPoint = false; - Reference< beans::XPropertySet > xSeriesProp( this->getPropertiesOfSeries() ); + Reference< beans::XPropertySet > xSeriesProp( getPropertiesOfSeries() ); if( xSeriesProp.is() ) xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint; return bVaryColorsByPoint; @@ -915,7 +915,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int { if( isAttributedDataPoint( index ) ) return m_xDataSeries->getDataPointByIndex(index); - return this->getPropertiesOfSeries(); + return getPropertiesOfSeries(); } uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const @@ -958,14 +958,14 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const adaptPointCache( index ); if( !m_apLabel_AttributedPoint.get() ) m_apLabel_AttributedPoint - = getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index)); + = getDataPointLabelFromPropertySet(getPropertiesOfPoint(index)); pRet = m_apLabel_AttributedPoint.get(); } else { if (!m_apLabel_Series) m_apLabel_Series - = getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index)); + = getDataPointLabelFromPropertySet(getPropertiesOfPoint(index)); pRet = m_apLabel_Series.get(); } if( !m_bAllowPercentValueInDataLabel ) @@ -978,7 +978,7 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const DataPointLabel* VDataSeries::getDataPointLabelIfLabel( sal_Int32 index ) const { - DataPointLabel* pLabel = this->getDataPointLabel( index ); + DataPointLabel* pLabel = getDataPointLabel( index ); if( !pLabel || (!pLabel->ShowNumber && !pLabel->ShowNumberInPercent && !pLabel->ShowCategoryName ) ) return nullptr; @@ -1000,7 +1000,7 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index // Cache these properties for this point. m_apLabelPropNames_AttributedPoint.reset(new tNameSequence); m_apLabelPropValues_AttributedPoint.reset(new tAnySequence); - xTextProp.set( this->getPropertiesOfPoint( index )); + xTextProp.set( getPropertiesOfPoint( index )); PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *m_apLabelPropNames_AttributedPoint, *m_apLabelPropValues_AttributedPoint); bDoDynamicFontResize = true; @@ -1015,7 +1015,7 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index // Cache these properties for the whole series. m_apLabelPropNames_Series.reset(new tNameSequence); m_apLabelPropValues_Series.reset(new tAnySequence); - xTextProp.set( this->getPropertiesOfPoint( index )); + xTextProp.set( getPropertiesOfPoint( index )); PropertyMapper::getTextLabelMultiPropertyLists( xTextProp, *m_apLabelPropNames_Series, *m_apLabelPropValues_Series); bDoDynamicFontResize = true; diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index 614770a199de..76cddf36f94c 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -29,10 +29,10 @@ using namespace ::com::sun::star; VLineProperties::VLineProperties() { - this->Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR - this->LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE - this->Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE - this->Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH + Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR + LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE + Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE + Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH } void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) @@ -41,11 +41,11 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert { try { - this->Color = xProp->getPropertyValue( "LineColor" ); - this->LineStyle = xProp->getPropertyValue( "LineStyle" ); - this->Transparence = xProp->getPropertyValue( "LineTransparence" ); - this->Width = xProp->getPropertyValue( "LineWidth" ); - this->DashName = xProp->getPropertyValue( "LineDashName" ); + Color = xProp->getPropertyValue( "LineColor" ); + LineStyle = xProp->getPropertyValue( "LineStyle" ); + Transparence = xProp->getPropertyValue( "LineTransparence" ); + Width = xProp->getPropertyValue( "LineWidth" ); + DashName = xProp->getPropertyValue( "LineDashName" ); } catch( const uno::Exception& e ) { @@ -53,7 +53,7 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert } } else - this->LineStyle <<= drawing::LineStyle_NONE; + LineStyle <<= drawing::LineStyle_NONE; } bool VLineProperties::isLineVisible() const @@ -61,11 +61,11 @@ bool VLineProperties::isLineVisible() const bool bRet = false; drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - this->LineStyle >>= aLineStyle; + LineStyle >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) { sal_Int16 nLineTransparence=0; - this->Transparence >>= nLineTransparence; + Transparence >>= nLineTransparence; if(nLineTransparence!=100) { bRet = true; diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 0807377bb301..af3725ae2eb2 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -431,7 +431,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents // Examine the index and apply the array std::deque< AttachedObject_Impl > aList = implCheckIndex( nIndex )->aObjList; for( const auto& rObj : aList ) - this->detach( nIndex, rObj.xTarget ); + detach( nIndex, rObj.xTarget ); const ScriptEventDescriptor* pArray = ScriptEvents.getConstArray(); sal_Int32 nLen = ScriptEvents.getLength(); @@ -439,7 +439,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents registerScriptEvent( nIndex, pArray[ i ] ); for( const auto& rObj : aList ) - this->attach( nIndex, rObj.xTarget, rObj.aHelper ); + attach( nIndex, rObj.xTarget, rObj.aHelper ); } @@ -457,7 +457,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent std::deque< AttachedObject_Impl > aList = aIt->aObjList; for( const auto& rObj : aList ) - this->detach( nIndex, rObj.xTarget ); + detach( nIndex, rObj.xTarget ); OUString aLstType = ListenerType; sal_Int32 nLastDot = aLstType.lastIndexOf('.'); @@ -479,7 +479,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent } for( const auto& rObj : aList ) - this->attach( nIndex, rObj.xTarget, rObj.aHelper ); + attach( nIndex, rObj.xTarget, rObj.aHelper ); } @@ -490,10 +490,10 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) std::deque< AttachedObject_Impl > aList = aIt->aObjList; for( const auto& rObj : aList ) - this->detach( nIndex, rObj.xTarget ); + detach( nIndex, rObj.xTarget ); aIt->aEventList.clear(); for( const auto& rObj : aList ) - this->attach( nIndex, rObj.xTarget, rObj.aHelper ); + attach( nIndex, rObj.xTarget, rObj.aHelper ); } @@ -518,7 +518,7 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) std::deque< AttachedObject_Impl > aList = aIt->aObjList; for( const auto& rObj : aList ) - this->detach( nIndex, rObj.xTarget ); + detach( nIndex, rObj.xTarget ); aIndex.erase( aIt ); } diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index 44b674b901c9..cf02d5c9bbf7 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -32,9 +32,9 @@ struct TagAttribute_Impl TagAttribute_Impl( const OUString &aName, const OUString &aType, const OUString &aValue ) { - this->sName = aName; - this->sType = aType; - this->sValue = aValue; + sName = aName; + sType = aType; + sValue = aValue; } OUString sName; diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx index 87a7d22ff222..f480e8374bc1 100644 --- a/compilerplugins/clang/plugin.hxx +++ b/compilerplugins/clang/plugin.hxx @@ -208,7 +208,7 @@ RewritePlugin::RewriteOptions::RewriteOptions( RewriteOption option ) { // Note that 'flags' stores also RemoveLineIfEmpty, it must be kept in sync with the base class. if( flags & RewritePlugin::RemoveLineIfEmpty ) - this->RemoveLineIfEmpty = true; + RemoveLineIfEmpty = true; } inline diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 5db4c82d3989..40a6abf09026 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -169,7 +169,7 @@ public: cppu::ComponentFactoryFunc fptr, const Sequence< OUString > & serviceNames, const Reference< XComponentContext > & defaultContext) : - cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo >( this->m_mutex ), + cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo >( m_mutex ), m_create( fptr ), m_serviceNames( serviceNames ), m_implName( rImplementationName_ ), diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index 91485855af39..de41bc9ed38e 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -74,7 +74,7 @@ class Driver : public MutexHolder, public DriverBase public: explicit Driver ( const css::uno::Reference < css::uno::XComponentContext > & ctx ) - : DriverBase( this->m_mutex ), + : DriverBase( m_mutex ), m_ctx( ctx ), m_smgr( ctx->getServiceManager() ) {} diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index f5de4e504abc..9da485738c59 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3503,8 +3503,8 @@ OUString SvxIconReplacementDialog::ReplaceIconName( const OUString& rMessage ) sal_uInt16 SvxIconReplacementDialog::ShowDialog() { - this->Execute(); - return ( this->GetCurButtonId() ); + Execute(); + return ( GetCurButtonId() ); } /******************************************************************************* * diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index f8b6735ef4ac..ab6578f40d8e 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -538,7 +538,7 @@ namespace svx } void SuggestionDisplay::SetHelpIds() { - this->SetHelpId( HID_HANGULDLG_SUGGESTIONS ); + SetHelpId( HID_HANGULDLG_SUGGESTIONS ); m_aValueSet->SetHelpId( HID_HANGULDLG_SUGGESTIONS_GRID ); m_aListBox->SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); } diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index d1ff39a6fb19..e03aa756ae3e 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -152,7 +152,7 @@ OUString SvxChartColorTable::getDefaultName( size_t _nIndex ) bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const { // note: XColorEntry has no operator == - bool bEqual = ( this->m_aColorEntries.size() == _rOther.m_aColorEntries.size() ); + bool bEqual = ( m_aColorEntries.size() == _rOther.m_aColorEntries.size() ); if( bEqual ) { @@ -298,7 +298,7 @@ bool SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const const SvxChartColorTableItem * rCTItem( dynamic_cast<const SvxChartColorTableItem * >( & rAttr )); if( rCTItem ) { - return (this->m_aColorTable == rCTItem->GetColorList()); + return (m_aColorTable == rCTItem->GetColorList()); } return false; diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 02baa443667a..df639fe77678 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -192,7 +192,7 @@ namespace drawinglayer if(!empty()) { - const sal_Int32 nCount(this->size()); + const sal_Int32 nCount(size()); for(sal_Int32 a(0L); a < nCount; a++) { diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index fb6384045a38..7ecb575907b1 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -515,7 +515,7 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter, nTmpEsc = -20; else nTmpEsc = nEsc; - Size aSize = ( this->GetFontSize() ); + Size aSize = ( GetFontSize() ); aPos.Y() -= ( nTmpEsc * aSize.Height() ) / 100L; } Font aOldFont( ChgPhysFont( pOut ) ); diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index 21db68c3c382..ef117d22cb6f 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -45,8 +45,8 @@ void CacheItem::update(const CacheItem& rUpdateItem) pItUpdate != rUpdateItem.end() ; ++pItUpdate ) { - iterator pItThis = this->find(pItUpdate->first); - if (pItThis == this->end()) + iterator pItThis = find(pItUpdate->first); + if (pItThis == end()) (*this)[pItUpdate->first] = pItUpdate->second; // add new prop else pItThis->second = pItUpdate->second; // change value of existing prop @@ -305,8 +305,8 @@ bool CacheItem::haveProps(const CacheItem& lProps) const ++pIt ) { // i) one required property does not exist at this item => return false - const_iterator pItThis = this->find(pIt->first); - if (pItThis == this->end()) + const_iterator pItThis = find(pIt->first); + if (pItThis == end()) { FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) return false; @@ -338,8 +338,8 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const // => continue with next one, because // "excluding" means... "don't have it". // And "not exists" matches to "don't have it". - const_iterator pItThis = this->find(pIt->first); - if (pItThis == this->end()) + const_iterator pItThis = find(pIt->first); + if (pItThis == end()) { FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... not found \"%s\" => continue loop!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first)) continue; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index af2988743336..e49eb2264593 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5961,12 +5961,12 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg, // Patriarch found (the upmost shape group container) ? if( DFF_msofbtSpgrContainer == nFbt ) { - if(!this->GetShapeGroupContainerData( rSt, nLength, true, nDrawingContainerId )) return; + if(!GetShapeGroupContainerData( rSt, nLength, true, nDrawingContainerId )) return; } // empty Shape Container ? (outside of shape group container) else if( DFF_msofbtSpContainer == nFbt ) { - if(!this->GetShapeContainerData( rSt, nLength, ULONG_MAX, nDrawingContainerId )) return; + if(!GetShapeContainerData( rSt, nLength, ULONG_MAX, nDrawingContainerId )) return; } else rSt.SeekRel( nLength ); @@ -5995,14 +5995,14 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, if( DFF_msofbtSpContainer == nFbt ) { sal_uLong nGroupOffs = bFirst ? nStartShapeGroupCont - DFF_COMMON_RECORD_HEADER_SIZE : ULONG_MAX; - if ( !this->GetShapeContainerData( rSt, nLength, nGroupOffs, nDrawingContainerId ) ) + if ( !GetShapeContainerData( rSt, nLength, nGroupOffs, nDrawingContainerId ) ) return false; bFirst = false; } // nested shape group container ? else if( DFF_msofbtSpgrContainer == nFbt ) { - if ( !this->GetShapeGroupContainerData( rSt, nLength, false, nDrawingContainerId ) ) + if ( !GetShapeGroupContainerData( rSt, nLength, false, nDrawingContainerId ) ) return false; } else diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 6caf231ad57e..069309f540c1 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1530,10 +1530,10 @@ void SVGTextWriter::writeTextPortion( const Point& rPos, return; bool bStandAloneTextPortion = false; - if( !this->isTextShapeStarted() ) + if( !isTextShapeStarted() ) { bStandAloneTextPortion = true; - this->startTextShape(); + startTextShape(); } mbLineBreak = false; @@ -1602,7 +1602,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos, if( bStandAloneTextPortion ) { - this->endTextShape(); + endTextShape(); } } diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 66f40ac5265f..63f282bd5633 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -118,7 +118,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any& // my name OUString sMyGroup; if (hasProperty(PROPERTY_GROUP_NAME, this)) - this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup; + getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup; if (sMyGroup.isEmpty()) sMyGroup = m_aName; @@ -200,8 +200,8 @@ void ORadioButtonModel::setControlSource() OUString sName, sGroupName; if (hasProperty(PROPERTY_GROUP_NAME, this)) - this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName; - this->getPropertyValue(PROPERTY_NAME) >>= sName; + getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName; + getPropertyValue(PROPERTY_NAME) >>= sName; Reference<XPropertySet> xMyProps( static_cast<XWeak*>(this), css::uno::UNO_QUERY); diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm index bb91affec99d..9fba038caa10 100644 --- a/fpicker/source/aqua/SalAquaPicker.mm +++ b/fpicker/source/aqua/SalAquaPicker.mm @@ -180,7 +180,7 @@ int SalAquaPicker::runandwaitforresult() { SolarMutexGuard aGuard; - int status = this->run(); + int status = run(); return status; } diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 0d4dc39f73f1..bfd698b69060 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -305,7 +305,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame // If we are this top frame itself (means our owner frame) // we should call ourself recursiv with a better target "_self". // So we can share the same code! (see reaction for "_self" inside this method too.) - xDispatcher = this->queryDispatch(aURL,SPECIALTARGET_SELF,0); + xDispatcher = queryDispatch(aURL,SPECIALTARGET_SELF,0); } else { diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 37c5321c747b..e2aabd3af857 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -95,7 +95,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); for( sal_Int32 i=0; i<nCount; ++i ) { - lDispatcher[i] = this->queryDispatch( + lDispatcher[i] = queryDispatch( lDescriptor[i].FeatureURL, lDescriptor[i].FrameName, lDescriptor[i].SearchFlags); diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index bef0902c5fde..03029bce3922 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -222,7 +222,7 @@ PopupMenuDispatcher::queryDispatches( css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); for( sal_Int32 i=0; i<nCount; ++i ) { - lDispatcher[i] = this->queryDispatch( + lDispatcher[i] = queryDispatch( lDescriptor[i].FeatureURL, lDescriptor[i].FrameName, lDescriptor[i].SearchFlags); diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index b1046a90d7a5..83c7535cadf1 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -95,7 +95,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); for( sal_Int32 i=0; i<nCount; ++i ) { - lDispatcher[i] = this->queryDispatch( + lDispatcher[i] = queryDispatch( lDescriptor[i].FeatureURL, lDescriptor[i].FrameName, lDescriptor[i].SearchFlags); diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index 764140af6d90..ba9ae4c2c562 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -77,7 +77,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); for( sal_Int32 i=0; i<nCount; ++i ) { - lDispatcher[i] = this->queryDispatch( + lDispatcher[i] = queryDispatch( lDescriptor[i].FeatureURL, lDescriptor[i].FrameName, lDescriptor[i].SearchFlags); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index a20435405741..571ed4b5801a 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -1285,7 +1285,7 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars() { for (auto const& rURL : aMakeVisibleToolbars) { - this->requestToolbar(rURL); + requestToolbar(rURL); } } } diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx index cab73a626b8f..4df1344ea8df 100644 --- a/hwpfilter/source/hiodev.cxx +++ b/hwpfilter/source/hiodev.cxx @@ -116,7 +116,7 @@ HStreamIODev::HStreamIODev(HStream * stream):_stream(stream) HStreamIODev::~HStreamIODev() { /* 플러시한 후 닫는다. */ - this->flush(); + flush(); if (_gzfp) gz_close(_gzfp); _gzfp = nullptr; diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index cbd4ada13e61..2f2aa8adc279 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -518,7 +518,7 @@ TransliterationImpl::getRange(const Sequence< OUString > &inStrs, } ostr.realloc(j_tmp); - return this->getRange(ostr, j_tmp, ++_numCascade); + return getRange(ostr, j_tmp, ++_numCascade); } @@ -532,7 +532,7 @@ TransliterationImpl::transliterateRange( const OUString& str1, const OUString& s ostr[0] = str1; ostr[1] = str2; - return this->getRange(ostr, 2, 0); + return getRange(ostr, 2, 0); } @@ -546,8 +546,8 @@ TransliterationImpl::compareSubstring( Sequence <sal_Int32> offset; - OUString in_str1 = this->transliterate(str1, off1, len1, offset); - OUString in_str2 = this->transliterate(str2, off2, len2, offset); + OUString in_str1 = transliterate(str1, off1, len1, offset); + OUString in_str2 = transliterate(str2, off2, len2, offset); const sal_Unicode* unistr1 = in_str1.getStr(); const sal_Unicode* unistr2 = in_str2.getStr(); sal_Int32 strlen1 = in_str1.getLength(); @@ -569,7 +569,7 @@ TransliterationImpl::compareString(const OUString& str1, const OUString& str2 ) if (caseignoreOnly && caseignore.is()) return caseignore->compareString(str1, str2); else - return this->compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength()); + return compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength()); } diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index 355334ab28e0..dae3f42924d9 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -33,8 +33,8 @@ transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 n Sequence< sal_Int32 > offset2; // The method folding is defined in a sub class. - OUString s1 = this->folding( str1, pos1, nCount1, offset1); - OUString s2 = this->folding( str2, pos2, nCount2, offset2); + OUString s1 = folding( str1, pos1, nCount1, offset1); + OUString s2 = folding( str2, pos2, nCount2, offset2); const sal_Unicode * p1 = s1.getStr(); const sal_Unicode * p2 = s2.getStr(); @@ -84,7 +84,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos Sequence< sal_Int32 >& offset ) { // The method folding is defined in a sub class. - return this->folding( inStr, startPos, nCount, offset); + return folding( inStr, startPos, nCount, offset); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index ec743606cc69..b26c6b524cb8 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -205,7 +205,7 @@ OUString SAL_CALL Transliteration_body::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) { - return this->transliterate(inStr, startPos, nCount, offset); + return transliterate(inStr, startPos, nCount, offset); } Transliteration_casemapping::Transliteration_casemapping() diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx index 987f0f97f54a..28c0ec66a13f 100644 --- a/i18npool/source/transliteration/transliteration_commonclass.cxx +++ b/i18npool/source/transliteration/transliteration_commonclass.cxx @@ -77,8 +77,8 @@ transliteration_commonclass::compareSubstring( Sequence <sal_Int32> offset1(2*len1); Sequence <sal_Int32> offset2(2*len2); - OUString in_str1 = this->transliterate(str1, off1, len1, offset1); - OUString in_str2 = this->transliterate(str2, off2, len2, offset2); + OUString in_str1 = transliterate(str1, off1, len1, offset1); + OUString in_str2 = transliterate(str2, off2, len2, offset2); sal_Int32 strlen1 = in_str1.getLength(); sal_Int32 strlen2 = in_str2.getLength(); const sal_Unicode* unistr1 = in_str1.getStr(); @@ -101,7 +101,7 @@ transliteration_commonclass::compareSubstring( sal_Int32 SAL_CALL transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 ) { - return( this->compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength())); + return( compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength())); } OUString SAL_CALL diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 7fb11d98d151..7dd941ae91cd 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -144,7 +144,7 @@ bool SvIdlDataBase::ReadIdFile( const OString& rOFileName ) return true; aIdFileList.push_back( rFileName ); - this->AddDepFile( aFullName ); + AddDepFile( aFullName ); SvTokenStream aTokStm( aFullName ); if( aTokStm.GetStream().GetError() == ERRCODE_NONE ) { diff --git a/include/canvas/propertysethelper.hxx b/include/canvas/propertysethelper.hxx index 472bb1d922ae..95126d6de615 100644 --- a/include/canvas/propertysethelper.hxx +++ b/include/canvas/propertysethelper.hxx @@ -68,27 +68,27 @@ namespace canvas const SetterType& setter) { MapType::MapEntry aEntry={name, {getter, setter}}; - this->push_back(aEntry); + push_back(aEntry); } MakeMap(const char* name, const GetterType& getter) { MapType::MapEntry aEntry={name, {getter, SetterType()}}; - this->push_back(aEntry); + push_back(aEntry); } MakeMap& operator()(const char* name, const GetterType& getter, const SetterType& setter) { MapType::MapEntry aEntry={name, {getter, setter}}; - this->push_back(aEntry); + push_back(aEntry); return *this; } MakeMap& operator()(const char* name, const GetterType& getter) { MapType::MapEntry aEntry={name, {getter, SetterType()}}; - this->push_back(aEntry); + push_back(aEntry); return *this; } }; diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index a5cd96615183..81fb69a009d3 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -95,33 +95,33 @@ public: typedef typename container_type::const_iterator const_iterator; Matrix() : mnWidth( 0 ) {} - explicit Matrix( size_type nWidth, size_type nHeight ) { this->resize( nWidth, nHeight ); } - explicit Matrix( size_type nWidth, size_type nHeight, const_reference rData ) { this->resize( nWidth, nHeight, rData ); } + explicit Matrix( size_type nWidth, size_type nHeight ) { resize( nWidth, nHeight ); } + explicit Matrix( size_type nWidth, size_type nHeight, const_reference rData ) { resize( nWidth, nHeight, rData ); } bool empty() const { return maData.empty(); } size_type size() const { return maData.size(); } size_type width() const { return mnWidth; } - size_type height() const { return this->empty() ? 0 : (this->size() / this->width()); } + size_type height() const { return empty() ? 0 : (size() / width()); } - void clear() { this->resize( 0, 0 ); } + void clear() { resize( 0, 0 ); } void resize( size_type nWidth, size_type nHeight ) { mnWidth = nWidth; maData.resize( nWidth * nHeight ); } void resize( size_type nWidth, size_type nHeight, const_reference rData ) { mnWidth = nWidth; maData.resize( nWidth * nHeight, rData ); } iterator at( size_type nX, size_type nY ) { return maData.begin() + mnWidth * nY + nX; } const_iterator at( size_type nX, size_type nY ) const { return maData.begin() + mnWidth * nY + nX; } - reference operator()( size_type nX, size_type nY ) { return *this->at( nX, nY ); } - const_reference operator()( size_type nX, size_type nY ) const { return *this->at( nX, nY ); } + reference operator()( size_type nX, size_type nY ) { return *at( nX, nY ); } + const_reference operator()( size_type nX, size_type nY ) const { return *at( nX, nY ); } iterator begin() { return maData.begin(); } const_iterator begin() const { return maData.begin(); } iterator end() { return maData.end(); } const_iterator end() const { return maData.end(); } - iterator row_begin( size_type nY ) { return this->at( 0, nY ); } - const_iterator row_begin( size_type nY ) const { return this->at( 0, nY ); } - iterator row_end( size_type nY ) { return this->at( mnWidth, nY ); } - const_iterator row_end( size_type nY ) const { return this->at( mnWidth, nY ); } + iterator row_begin( size_type nY ) { return at( 0, nY ); } + const_iterator row_begin( size_type nY ) const { return at( 0, nY ); } + iterator row_end( size_type nY ) { return at( mnWidth, nY ); } + const_iterator row_end( size_type nY ) const { return at( mnWidth, nY ); } reference row_front( size_type nY ) { return (*this)( 0, nY ); } const_reference row_front( size_type nY ) const { return (*this)( 0, nY ); } diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx index 0b2be13fbc30..54b6a12f9541 100644 --- a/include/registry/reader.hxx +++ b/include/registry/reader.hxx @@ -92,7 +92,7 @@ public: */ Reader & operator =(Reader const & other) { Reader temp(other); - std::swap(this->m_handle, temp.m_handle); + std::swap(m_handle, temp.m_handle); return *this; } diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 326cb6abf581..07ac32a61652 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -486,14 +486,14 @@ public: // Return value: TRISTATE_TRUE == Ok, TRISTATE_FALSE == Cancel, TRISTATE_INDET == Ok and Make visible moved entry virtual TriState NotifyMoving( - SvTreeListEntry* pTarget, // D'n'D DropPosition in this->GetModel() + SvTreeListEntry* pTarget, // D'n'D DropPosition in GetModel() SvTreeListEntry* pEntry, // Entry to be moved from GetSourceListBox()->GetModel() SvTreeListEntry*& rpNewParent, // New TargetParent sal_uLong& rNewChildPos); // The TargetParent's position in Childlist // Return value: TRISTATE_TRUE == Ok, TRISTATE_FALSE == Cancel, TRISTATE_INDET == Ok and Make visible moved entry virtual TriState NotifyCopying( - SvTreeListEntry* pTarget, // D'n'D DropPosition in this->GetModel() + SvTreeListEntry* pTarget, // D'n'D DropPosition in GetModel() SvTreeListEntry* pEntry, // Entry to be copied from GetSourceListBox()->GetModel() SvTreeListEntry*& rpNewParent, // New TargetParent sal_uLong& rNewChildPos); // The TargetParent's position in Childlist diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 818d0f328306..1618bdcd85da 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -183,7 +183,7 @@ void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyVa m_settings.schema = aDbName; // Check if the server is 4.1 or above - if (this->getMysqlVersion() < 40100) { + if (getMysqlVersion() < 40100) { throw SQLException( "MariaDB LibreOffice Connector requires MySQL Server 4.1 or above", *this, diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index f54ba842eaa1..2d0d6e19fbda 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -155,7 +155,7 @@ SvNumberFormatter* DoubleSequenceContext::getNumberFormatter() if( mpNumberFormatter == nullptr ) { uno::Reference<uno::XComponentContext> rContext = - this->getFilter().getComponentContext(); + getFilter().getComponentContext(); mpNumberFormatter.reset( new SvNumberFormatter(rContext, LANGUAGE_DONTKNOW) ); } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 38b946a5e792..021178a9a8e4 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -770,7 +770,7 @@ Reference< XShape > const & Shape::createAndInsert( } //If the text box has links then save the link information so that //it can be accessed in DomainMapper_Impl.cxx while chaining the text frames. - if (this->isLinkedTxbx()) + if (isLinkedTxbx()) { uno::Reference<beans::XPropertySet> propertySet (mxShape, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag; @@ -778,11 +778,11 @@ Reference< XShape > const & Shape::createAndInsert( sal_Int32 length = aGrabBag.getLength(); aGrabBag.realloc( length + 3 ); aGrabBag[length].Name = "TxbxHasLink"; - aGrabBag[length].Value <<= this->isLinkedTxbx(); + aGrabBag[length].Value <<= isLinkedTxbx(); aGrabBag[length + 1 ].Name = "Txbx-Id"; - aGrabBag[length + 1 ].Value <<= this->getLinkedTxbxAttributes().id; + aGrabBag[length + 1 ].Value <<= getLinkedTxbxAttributes().id; aGrabBag[length + 2 ].Name = "Txbx-Seq"; - aGrabBag[length + 2 ].Value <<= this->getLinkedTxbxAttributes().seq; + aGrabBag[length + 2 ].Value <<= getLinkedTxbxAttributes().seq; propertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aGrabBag)); } diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 6747511840ed..96171eabf947 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -660,9 +660,9 @@ void SaxExpatParser_Impl::parse( ) nRead, 0 ) != XML_STATUS_ERROR ); - if( ! bContinue || this->bExceptionWasThrown ) { + if( ! bContinue || bExceptionWasThrown ) { - if ( this->bRTExceptionWasThrown ) + if ( bRTExceptionWasThrown ) throw rtexception; // Error during parsing ! diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx index c6fa083f6d9e..ee323ef5cf77 100644 --- a/sax/test/sax/testwriter.cxx +++ b/sax/test/sax/testwriter.cxx @@ -175,9 +175,9 @@ struct TagAttribute const OUString &sType , const OUString &sValue ) { - this->sName = sName; - this->sType = sType; - this->sValue = sValue; + sName = sName; + sType = sType; + sValue = sValue; } OUString sName; diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index 5bf2f3ec1c70..f00d598b722f 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -282,9 +282,9 @@ struct TagAttribute const OUString &s_Type , const OUString &s_Value ) { - this->sName = s_Name; - this->sType = s_Type; - this->sValue = s_Value; + sName = s_Name; + sType = s_Type; + sValue = s_Value; } OUString sName; diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 5b2a942e8ca9..54edf124e9cd 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -103,7 +103,7 @@ void ScFormulaListener::stopListening() if (mpDoc->IsClipOrUndo()) return; - this->EndListeningAll(); + EndListeningAll(); } ScFormulaListener::~ScFormulaListener() diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 016630f1c061..6ad833f37370 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -792,7 +792,7 @@ ScFormulaGroupIterator::ScFormulaGroupIterator( ScDocument* pDoc ) : sc::FormulaGroupEntry* ScFormulaGroupIterator::first() { - return this->next(); + return next(); } sc::FormulaGroupEntry* ScFormulaGroupIterator::next() diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index c45c4c0bcedb..293e00d9f0e2 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -969,7 +969,7 @@ void ScFormulaCell::GetFormula( OUStringBuffer& rBuffer, if( p ) { /* FIXME: original GetFormula() code obtained - * pCell only if (!this->IsInChangeTrack()), + * pCell only if (!IsInChangeTrack()), * GetEnglishFormula() omitted that test. * Can we live without in all cases? */ ScFormulaCell* pCell = nullptr; @@ -1034,7 +1034,7 @@ OUString ScFormulaCell::GetFormula( sc::CompileFormulaContext& rCxt ) const if( p ) { /* FIXME: original GetFormula() code obtained - * pCell only if (!this->IsInChangeTrack()), + * pCell only if (!IsInChangeTrack()), * GetEnglishFormula() omitted that test. * Can we live without in all cases? */ ScFormulaCell* pCell = nullptr; diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 4ead995f07b7..f1018d469e70 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -352,7 +352,7 @@ void DefinedName::convertFormula( const css::uno::Sequence<css::sheet::ExternalL ScTokenArray* pTokenArray = mpScRangeData->GetCode(); Sequence< FormulaToken > aFTokenSeq; - (void)ScTokenConversion::ConvertToTokenSequence( this->getScDocument(), aFTokenSeq, *pTokenArray ); + (void)ScTokenConversion::ConvertToTokenSequence( getScDocument(), aFTokenSeq, *pTokenArray ); // set built-in names (print ranges, repeated titles, filter ranges) if( !isGlobalName() ) switch( mcBuiltinId ) { diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 13f002294af9..d994dcbdfb22 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -354,7 +354,7 @@ IMPL_LINK( ScImportOptionsDlg, DoubleClickHdl, ListBox&, rLb, void ) void ScImportOptionsDlg::SaveImportOptions() const { std::shared_ptr < comphelper::ConfigurationChanges > batch(comphelper::ConfigurationChanges::create()); - officecfg::Office::Calc::Dialogs::CSVExport::CharSet::set(this->m_pLbCharset->GetSelectTextEncoding(), batch); + officecfg::Office::Calc::Dialogs::CSVExport::CharSet::set(m_pLbCharset->GetSelectTextEncoding(), batch); officecfg::Office::Calc::Dialogs::CSVExport::FieldSeparator::set(m_pEdFieldSep->GetText(), batch); officecfg::Office::Calc::Dialogs::CSVExport::TextSeparator::set(m_pEdTextSep->GetText(), batch); officecfg::Office::Calc::Dialogs::CSVExport::FixedWidth::set(m_pCbFixed->IsChecked(), batch); diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 1fa759ad5dbd..3344879c18f1 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -47,8 +47,8 @@ ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, m_pTabBgColorSet->SetColCount(SvxColorValueSet::getColumnCount()); get(m_pBtnOk, "ok"); - this->SetText( rTitle ); - this->SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE); + SetText( rTitle ); + SetStyle(GetStyle() | WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL | WB_SYSTEMWINDOW | WB_STANDALONE | WB_HIDE); FillColorValueSets_Impl(); m_pTabBgColorSet->SetDoubleClickHdl( HDL(TabBgColorDblClickHdl_Impl) ); @@ -69,7 +69,7 @@ void ScTabBgColorDlg::dispose() void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) const { - rColor = this->m_aTabBgColor; + rColor = m_aTabBgColor; } void ScTabBgColorDlg::FillColorValueSets_Impl() diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index f50a852202ac..5099a64fd54e 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1977,7 +1977,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum uno::Reference< chart2::data::XDataSource > xCompareDataSource; try { - xCompareDataSource.set( this->createDataSource( comphelper::containerToSequence( aResult ) ) ); + xCompareDataSource.set( createDataSource( comphelper::containerToSequence( aResult ) ) ); } catch( const lang::IllegalArgumentException & ) { diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 4946b0099817..457d659c006c 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -633,7 +633,7 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const } else if ( aPropertyName == SC_UNONAME_MOVEPROTECT ) { - if( SdrObject* pObj = this->GetSdrObject() ) + if( SdrObject* pObj = GetSdrObject() ) { bool aProt = false; if( aValue >>= aProt ) @@ -815,7 +815,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) else if ( aPropertyName == SC_UNONAME_MOVEPROTECT ) { bool aProt = false; - if ( SdrObject* pObj = this->GetSdrObject() ) + if ( SdrObject* pObj = GetSdrObject() ) aProt = pObj->IsMoveProtect(); aAny <<= aProt; } diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index e6b356639144..840d101806b4 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -456,7 +456,7 @@ ScVbaWorksheets::Item(const uno::Any& Index, const uno::Any& Index2) aSheets.push_back( xSheet ); } uno::Reference< container::XIndexAccess > xIndexAccess = new SheetCollectionHelper( aSheets ); - uno::Reference< XCollection > xSelectedSheets( new ScVbaWorksheets( this->getParent(), mxContext, xIndexAccess, mxModel ) ); + uno::Reference< XCollection > xSelectedSheets( new ScVbaWorksheets( getParent(), mxContext, xIndexAccess, mxModel ) ); return uno::makeAny( xSelectedSheets ); } return ScVbaWorksheets_BASE::Item( Index, Index2 ); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 63fb7b9ca681..8c173c4194a9 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1347,7 +1347,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount ) { - ScGridWindow* pWin = this->GetActiveWin(); + ScGridWindow* pWin = GetActiveWin(); if ( pWin->InsideVisibleRange(nStartCol, nStartRow) && pWin->InsideVisibleRange(nEndCol, nEndRow) ) { if ( nCount == ::std::numeric_limits<sal_uLong>::max() ) diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 03e2d148bd9a..ebd942aecf6a 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -112,7 +112,7 @@ const Sequence < DispatchDescriptor >& seqDescriptor ) Sequence< Reference< XDispatch > > lDispatcher( nCount ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - lDispatcher[ i ] = this->queryDispatch( seqDescriptor[ i ].FeatureURL, + lDispatcher[ i ] = queryDispatch( seqDescriptor[ i ].FeatureURL, seqDescriptor[ i ].FrameName, seqDescriptor[ i ].SearchFlags ); } diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 68069398399a..b76c3346ad7f 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -138,7 +138,7 @@ bool Ppt97Animation::GetSpecialDuration( double& rfDurationInSeconds ) const bool Ppt97Animation::GetSpecialTextIterationDelay( double& rfTextIterationDelay ) const { bool bRet = false; - switch(this->GetTextAnimationType()) + switch(GetTextAnimationType()) { case presentation::TextAnimationType::BY_LETTER: rfTextIterationDelay = 0.075; @@ -163,10 +163,10 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) if( !bAnimate ) { //the appear effect cannot be animated without text - if( this->GetPresetId() == "ooo-entrance-appear" ) + if( GetPresetId() == "ooo-entrance-appear" ) return; //the random effect may be the appear effect and than has the same problem - if( this->GetPresetId() == "ooo-entrance-random" ) + if( GetPresetId() == "ooo-entrance-random" ) { //this case is not 100% correct -> feel free to complete //i consider this case as seldom and not that problematic and a simple correct fix is not in sight @@ -545,7 +545,7 @@ void Ppt97Animation::UpdateCacheData() const void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) { - if( !this->HasEffect() ) + if( !HasEffect() ) return; if( !pObj || !pObj->GetPage() ) { @@ -567,7 +567,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) } const ::sd::CustomAnimationPresets& rPresets( ::sd::CustomAnimationPresets::getCustomAnimationPresets() ); - ::sd::CustomAnimationPresetPtr pPreset( rPresets.getEffectDescriptor( this->GetPresetId() ) ); + ::sd::CustomAnimationPresetPtr pPreset( rPresets.getEffectDescriptor( GetPresetId() ) ); if( !pPreset.get() ) { OSL_FAIL("no suitable preset found for ppt import"); @@ -577,7 +577,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) //--------------start doing something //1. ------ create an effect from the presets ------ - ::sd::CustomAnimationEffectPtr pEffect( new ::sd::CustomAnimationEffect( pPreset->create( this->GetPresetSubType() ) ) ); + ::sd::CustomAnimationEffectPtr pEffect( new ::sd::CustomAnimationEffect( pPreset->create( GetPresetSubType() ) ) ); if( !pEffect.get() ) { DBG_ASSERT(pEffect.get(),"no suitable effect found"); @@ -589,57 +589,57 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // set the shape targeted by this effect pEffect->setTarget( makeAny( xShape ) ); - pEffect->setBegin( this->GetDelayTimeInSeconds() ); + pEffect->setBegin( GetDelayTimeInSeconds() ); // some effects need a different duration than that of the mapped preset effect double fDurationInSeconds = 1.0; //in seconds - if( this->GetSpecialDuration( fDurationInSeconds ) ) + if( GetSpecialDuration( fDurationInSeconds ) ) pEffect->setDuration( fDurationInSeconds ); // set after effect - if( this->HasAfterEffect() ) + if( HasAfterEffect() ) { pEffect->setHasAfterEffect( true ); - if( this->HasAfterEffect_ChangeColor() ) - pEffect->setDimColor( uno::makeAny( this->GetDimColor() ) ); + if( HasAfterEffect_ChangeColor() ) + pEffect->setDimColor( uno::makeAny( GetDimColor() ) ); else - pEffect->setAfterEffectOnNext( this->HasAfterEffect_DimAtNextEffect() ); + pEffect->setAfterEffectOnNext( HasAfterEffect_DimAtNextEffect() ); } // set sound effect - if( this->HasSoundEffect() ) + if( HasSoundEffect() ) pEffect->createAudio( uno::makeAny( m_aSoundFileUrl ) ); // text iteration - pEffect->setIterateType( this->GetTextAnimationType() ); + pEffect->setIterateType( GetTextAnimationType() ); // some effects need a different delay between text iteration than that of the mapped preset effect double fTextIterationDelay = 1.0; - if( this->GetSpecialTextIterationDelay( fTextIterationDelay ) ) + if( GetSpecialTextIterationDelay( fTextIterationDelay ) ) pEffect->setIterateInterval( fTextIterationDelay ); // is the effect started on click or after the last effect (Another possible value is EffectNodeType::WITH_PREVIOUS ) - pEffect->setNodeType( this->GetEffectNodeType() ); + pEffect->setNodeType( GetEffectNodeType() ); //set stop sound effect - if( this->HasStopPreviousSound() ) + if( HasStopPreviousSound() ) pEffect->setStopAudio(); // append the effect to the main sequence - if( !this->HasParagraphEffect() ) + if( !HasParagraphEffect() ) { - // TODO: !this->HasAnimateAssociatedShape() can possibly have this set to ONLY_TEXT - see i#42737 + // TODO: !HasAnimateAssociatedShape() can possibly have this set to ONLY_TEXT - see i#42737 pEffect->setTargetSubItem( presentation::ShapeAnimationSubType::AS_WHOLE ); } //3. ------ put the created effect to the model and do some last changes fro paragraph effects ------ pMainSequence->append( pEffect ); - if( this->HasParagraphEffect() ) + if( HasParagraphEffect() ) { - sal_Int32 nParagraphLevel = this->GetParagraphLevel(); - double fDelaySeconds = this->GetDelayTimeInSeconds(); - bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text - bool bTextReverse = this->HasReverseOrder(); + sal_Int32 nParagraphLevel = GetParagraphLevel(); + double fDelaySeconds = GetDelayTimeInSeconds(); + bool bAnimateAssociatedShape = HasAnimateAssociatedShape();//or only text + bool bTextReverse = HasReverseOrder(); // now create effects for each paragraph ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> @@ -656,11 +656,11 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) { ::sd::CustomAnimationEffectPtr pGroupEffect(*aIter); - ////todo? if( nIndex > 1 && pLastEffect && this->HasSoundEffect() ) + ////todo? if( nIndex > 1 && pLastEffect && HasSoundEffect() ) //// pLastEffect->setStopAudio(); if( nIndex < 2 ) { - pGroupEffect->setNodeType( this->GetEffectNodeType() ); + pGroupEffect->setNodeType( GetEffectNodeType() ); } else if( nIndex > 0 ) { @@ -670,8 +670,8 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) else bAtParagraphBegin = !pLastEffect || pLastEffect->getParaDepth() < nParagraphLevel; if( bAtParagraphBegin ) - pGroupEffect->setNodeType( this->GetEffectNodeType() ); - else if( this->GetTextAnimationType() == presentation::TextAnimationType::BY_PARAGRAPH ) + pGroupEffect->setNodeType( GetEffectNodeType() ); + else if( GetTextAnimationType() == presentation::TextAnimationType::BY_PARAGRAPH ) pGroupEffect->setNodeType( presentation::EffectNodeType::WITH_PREVIOUS ); else pGroupEffect->setNodeType( presentation::EffectNodeType::AFTER_PREVIOUS ); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 5fac67cbb8c3..b530e3ee8471 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -841,7 +841,7 @@ void AccessibleSlideSorterView::Implementation::Notify ( void AccessibleSlideSorterView::SwitchViewActivated() { // Firstly, set focus to view - this->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, + FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(), Any(AccessibleStateType::FOCUSED)); diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 81f102275791..ce19fcc57e53 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -70,7 +70,7 @@ void ConfigurationControllerResourceManager::ActivateResources ( rResources.begin(), rResources.end(), [&] (Reference<XResourceId> const& xResource) { - return this->ActivateResource(xResource, rxConfiguration); + return ActivateResource(xResource, rxConfiguration); } ); } @@ -86,7 +86,7 @@ void ConfigurationControllerResourceManager::DeactivateResources ( rResources.rbegin(), rResources.rend(), [&] (Reference<XResourceId> const& xResource) { - return this->DeactivateResource(xResource, rxConfiguration); + return DeactivateResource(xResource, rxConfiguration); } ); } diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 541aed855a2d..ceeda102db2f 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -51,7 +51,7 @@ const Reference< XBreakIterator >& DrawXmlOptimizer::GetBreakIterator() { if ( !mxBreakIter.is() ) { - Reference< XComponentContext > xContext( this->m_rProcessor.m_xContext, uno::UNO_SET_THROW ); + Reference< XComponentContext > xContext( m_rProcessor.m_xContext, uno::UNO_SET_THROW ); mxBreakIter = BreakIterator::create(xContext); } return mxBreakIter; diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index e7e70a878cf2..bd7b9c66fd8b 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -162,7 +162,7 @@ Sequence< Reference < XDispatch > > SAL_CALL SfxAppDispatchProvider::queryDispat sal_Int32 nCount = seqDescriptor.getLength(); uno::Sequence< uno::Reference < frame::XDispatch > > lDispatcher(nCount); for( sal_Int32 i=0; i<nCount; ++i ) - lDispatcher[i] = this->queryDispatch( seqDescriptor[i].FeatureURL, + lDispatcher[i] = queryDispatch( seqDescriptor[i].FeatureURL, seqDescriptor[i].FrameName, seqDescriptor[i].SearchFlags ); return lDispatcher; diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 7621ea7665b8..3d18c43a93fb 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -112,7 +112,7 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL sal_Int32 nCount = seqDescriptor.getLength(); uno::Sequence< uno::Reference<frame::XDispatch> > lDispatcher(nCount); for( sal_Int32 i=0; i<nCount; ++i ) - lDispatcher[i] = this->queryDispatch( seqDescriptor[i].FeatureURL, + lDispatcher[i] = queryDispatch( seqDescriptor[i].FeatureURL, seqDescriptor[i].FrameName, seqDescriptor[i].SearchFlags ); return lDispatcher; diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index f1550da9c0b3..b7913dc4e349 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -1316,9 +1316,9 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource, || typeid(i_rSource) == typeid(MetadatableClipboard) || typeid(*this) == typeid(MetadatableClipboard), "RegisterAsCopyOf element with different class?"); - OSL_ENSURE(!this->m_pReg, "RegisterAsCopyOf called on element with XmlId?"); + OSL_ENSURE(!m_pReg, "RegisterAsCopyOf called on element with XmlId?"); - if (this->m_pReg) + if (m_pReg) { RemoveMetadataReference(); } @@ -1339,7 +1339,7 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource, dynamic_cast<XmlIdRegistryDocument&>( rReg ) ); rRegDoc.RegisterCopy(i_rSource, *this, i_bCopyPrecedesSource); - this->m_pReg = &rRegDoc; + m_pReg = &rRegDoc; } return; } @@ -1366,7 +1366,7 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource, } Metadatable & rLink( pRegClp->RegisterCopyClipboard(*this, SourceRef, isLatent)); - this->m_pReg = pRegClp; + m_pReg = pRegClp; // register as copy in the non-clipboard registry pSourceRegDoc->RegisterCopy(i_rSource, rLink, false); // i_bCopyPrecedesSource); @@ -1390,12 +1390,12 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource, // element is still in the same stream // N.B.: we check the stream of pLink, not of i_rSource! bool srcInContent( pLink->IsInContent() ); - bool tgtInContent( this->IsInContent() ); + bool tgtInContent( IsInContent() ); if (srcInContent == tgtInContent) { pRegDoc->RegisterCopy(*pLink, *this, true); // i_bCopyPrecedesSource); - this->m_pReg = pRegDoc; + m_pReg = pRegDoc; } // otherwise: stream change! do not register! } @@ -1453,7 +1453,7 @@ void Metadatable::RestoreMetadata( RemoveMetadataReference(); if (i_pUndo) { - this->RegisterAsCopyOf(*i_pUndo, true); + RegisterAsCopyOf(*i_pUndo, true); } } @@ -1473,8 +1473,8 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther, } if (i_isMergedEmpty && !i_isOtherEmpty) { - this->RemoveMetadataReference(); - this->RegisterAsCopyOf(i_rOther, true); + RemoveMetadataReference(); + RegisterAsCopyOf(i_rOther, true); return; } @@ -1485,7 +1485,7 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther, } if (!m_pReg) { - this->RegisterAsCopyOf(i_rOther, true); + RegisterAsCopyOf(i_rOther, true); // assumption: i_rOther will be deleted, so don't unregister it here return; } diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 41d8869d811e..ddbd8a9d90bc 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -132,7 +132,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const ScopedVclPtrInstance< VirtualDevice > pDevice; pDevice->EnableOutput( false ); - MapMode aMode( this->GetMapUnit() ); + MapMode aMode( GetMapUnit() ); pDevice->SetMapMode( aMode ); xFile->SetPrefMapMode( aMode ); diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx index 31b6854091f3..e00845bc3501 100644 --- a/slideshow/source/engine/activities/activitybase.cxx +++ b/slideshow/source/engine/activities/activitybase.cxx @@ -132,7 +132,7 @@ namespace slideshow if (mbFirstPerformCall) { mbFirstPerformCall = false; // notify derived classes that we're starting now - this->startAnimation(); + startAnimation(); } performEnd(); // calling private virtual diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index b202f4d3a6e8..df2ce3cdf3cb 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -41,7 +41,7 @@ namespace slideshow { // negate comparison, we want priority queue to be sorted // in increasing order of activation times - return this->nTime > rEvent.nTime; + return nTime > rEvent.nTime; } diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 1dccc7037ea1..2a12f0543e5e 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -88,7 +88,7 @@ namespace slideshow // init views for( const auto& rView : mrViews ) - this->viewAdded( rView ); + viewAdded( rView ); } void LayerManager::activate() diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index 15c7a0d7c720..e15936e685ea 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -64,11 +64,11 @@ void ShapeManagerImpl::activate() // clone listener map uno::Reference<presentation::XShapeEventListener> xDummyListener; for( const auto& rListener : mrGlobalListenersMap ) - this->listenerAdded( xDummyListener, rListener.first ); + listenerAdded( xDummyListener, rListener.first ); // clone cursor map for( const auto& rListener : mrGlobalCursorMap ) - this->cursorChanged( rListener.first, rListener.second ); + cursorChanged( rListener.first, rListener.second ); if( mpLayerManager ) mpLayerManager->activate(); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 8f4ae3001a7b..0c51937b2b82 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -364,7 +364,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra { // clone already existing views for slide bitmaps for( const auto& rView : rViewContainer ) - this->viewAdded( rView ); + viewAdded( rView ); // register screen update (LayerManager needs to signal pending // updates) diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 48b52dc956b2..27c4625839a0 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -75,7 +75,7 @@ namespace slideshow mbActive( bActive ) { for( const auto& rView : rViews ) - this->viewAdded( rView ); + viewAdded( rView ); drawPolygons(); } @@ -114,14 +114,14 @@ namespace slideshow { mbIsLastPointValid = false; mbActive = true; - this->maStrokeColor = rUserColor; - this->mbIsEraseModeActivated = false; + maStrokeColor = rUserColor; + mbIsEraseModeActivated = false; return true; } bool widthChanged( double nUserStrokeWidth ) override { - this->mnStrokeWidth = nUserStrokeWidth; + mnStrokeWidth = nUserStrokeWidth; mbIsEraseModeActivated = false; return true; } @@ -163,7 +163,7 @@ namespace slideshow bool eraseAllInkChanged( bool bEraseAllInk ) override { - this->mbIsEraseAllModeActivated = bEraseAllInk; + mbIsEraseAllModeActivated = bEraseAllInk; // if the erase all mode is activated it will remove all ink from slide, // therefore destroy all the polygons stored if(mbIsEraseAllModeActivated) @@ -180,9 +180,9 @@ namespace slideshow bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) override { // Change the size - this->mnSize=rEraseInkSize; + mnSize=rEraseInkSize; // Changed to mode Erase - this->mbIsEraseModeActivated = true; + mbIsEraseModeActivated = true; return true; } @@ -190,7 +190,7 @@ namespace slideshow { mbIsLastPointValid = false; mbActive = true; - this->mbIsEraseModeActivated = false; + mbIsEraseModeActivated = false; return true; } @@ -198,7 +198,7 @@ namespace slideshow { mbIsLastPointValid = false; mbActive = true; - this->mbIsEraseModeActivated = true; + mbIsEraseModeActivated = true; return true; } diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index cdc1d22134c8..9ea21486e5ed 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -180,7 +180,7 @@ void SlideChangeBase::prefetch( const AnimatableShapeSharedPtr&, // init views and create slide bitmaps for( const auto& pView : mrViewContainer ) - this->viewAdded( pView ); + viewAdded( pView ); mbPrefetched = true; } diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index 918ca961e04c..aeecd72caa74 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -67,7 +67,7 @@ WaitSymbol::WaitSymbol( uno::Reference<rendering::XBitmap> const & xBitmap, mbVisible(false) { for( const auto& pView : rViewContainer ) - this->viewAdded( pView ); + viewAdded( pView ); } void WaitSymbol::setVisible( const bool bVisible ) diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index 3960498ab4a8..7c1c6df689f6 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -241,8 +241,8 @@ void SmCursor::DeletePrev(OutputDevice* pDev){ //Else move select, and delete if not complex }else{ - this->Move(pDev, MoveLeft, false); - if(!this->HasComplexSelection()) + Move(pDev, MoveLeft, false); + if(!HasComplexSelection()) Delete(); } } diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 5e9526fb3827..46dd51b8084d 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -58,7 +58,7 @@ public: SfxItemPropertyMap_Impl::SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl* pSource ) { - this->SfxItemPropertyHashMap_t::operator=( *pSource ); + SfxItemPropertyHashMap_t::operator=( *pSource ); m_aPropSeq = pSource->m_aPropSeq; } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index cf5e9a2aa05d..0b216898002e 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -482,7 +482,7 @@ bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox const * pSource, sal_Int - entry is inserted at the end of the target childlist */ TriState SvTreeListBox::NotifyMoving( - SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel() + SvTreeListEntry* pTarget, // D&D dropping position in GetModel() SvTreeListEntry* pEntry, // entry that we want to move, from // GetSourceListBox()->GetModel() SvTreeListEntry*& rpNewParent, // new target parent @@ -516,7 +516,7 @@ TriState SvTreeListBox::NotifyMoving( } TriState SvTreeListBox::NotifyCopying( - SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel() + SvTreeListEntry* pTarget, // D&D dropping position in GetModel() SvTreeListEntry* pEntry, // entry that we want to move, from // GetSourceListBox()->GetModel() SvTreeListEntry*& rpNewParent, // new target parent @@ -1074,7 +1074,7 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt ) else { DBG_ASSERT(g_pDDSource, "SvTreeListBox::QueryDrop(): SourceBox == 0"); - if (!( pEntry && g_pDDSource->GetModel() == this->GetModel() + if (!( pEntry && g_pDDSource->GetModel() == GetModel() && DND_ACTION_MOVE == rEvt.mnAction && (pEntry->nEntryFlags & SvTLEntryFlags::DISABLE_DROP))) { @@ -1211,7 +1211,7 @@ nAction #ifndef UNX if ( (nAction == DND_ACTION_MOVE) - && ( (g_pDDTarget && (g_pDDTarget->GetModel() != this->GetModel())) + && ( (g_pDDTarget && (g_pDDTarget->GetModel() != GetModel())) || !g_pDDTarget)) { RemoveSelection(); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 70b2897f7851..8392ba2fd678 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2734,7 +2734,7 @@ uno::Reference< XAccessible > Ruler::CreateAccessible() aStr = SvtResId(STR_SVT_ACC_RULER_VERT_NAME); } mxAccContext = new SvtRulerAccessible( xAccParent, *this, aStr ); - this->SetAccessible(mxAccContext.get()); + SetAccessible(mxAccContext.get()); return mxAccContext.get(); } else diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index a2f00c5821dd..70799f969bba 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -106,7 +106,7 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void) mpBtnCancel->Disable(); mpBtnClose->GrabFocus(); - this->setOptimalLayoutSize(); + setOptimalLayoutSize(); } else if (pBtn == mpBtnCancel.get()) { diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 543fde87da3a..2f8b98ba915a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1616,7 +1616,7 @@ void SdrOle2Obj::ImpSetVisAreaSize() { //also handle not sfx based ole objects e.g. charts //#i83860# resizing charts in impress distorts fonts - uno::Reference< embed::XVisualObject > xVisualObject( this->getXModel(), uno::UNO_QUERY ); + uno::Reference< embed::XVisualObject > xVisualObject( getXModel(), uno::UNO_QUERY ); if( xVisualObject.is() ) { MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( mpImpl->mxObjRef->getMapUnit( GetAspect() ) ); diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 2e30cc3edf5f..83078bb72216 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -990,7 +990,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( bool bAllowGrowVertical = !bVerticalWriting; bool bAllowGrowHorizontal = bVerticalWriting; // Compatibility mode for tdf#99729 - if (this->pModel->IsAnchoredTextOverflowLegacy()) + if (pModel->IsAnchoredTextOverflowLegacy()) { bAllowGrowVertical = bHorizontalIsBlock; bAllowGrowHorizontal = bVerticalIsBlock; diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 5f6f21368805..cbd89c4b69d5 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -130,7 +130,7 @@ void SdrVirtObj::RecalcBoundRect() SdrVirtObj* SdrVirtObj::Clone() const { - return new SdrVirtObj(this->rRefObj); // only a further reference + return new SdrVirtObj(rRefObj); // only a further reference } SdrVirtObj& SdrVirtObj::operator=(const SdrVirtObj& rObj) diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 42165d13c10e..9cf36f8e1af2 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -68,7 +68,7 @@ void FormatPaintBrushToolBoxControl::DoubleClick() m_aDoubleClickTimer.Stop(); m_bPersistentCopy = true; - this->impl_executePaintBrush(); + impl_executePaintBrush(); } @@ -82,7 +82,7 @@ void FormatPaintBrushToolBoxControl::Click() IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, Timer *, void) { //there was no second click during waiting - this->impl_executePaintBrush(); + impl_executePaintBrush(); } diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index bfae004e9e57..9830080f703c 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -127,7 +127,7 @@ public: // controlled access to Modify method // mba: this is still considered a hack and it should be fixed; the name makes grep-ing easier - void ModifyNotification( const SfxPoolItem *pOldValue, const SfxPoolItem *pNewValue ) { this->Modify ( pOldValue, pNewValue ); } + void ModifyNotification( const SfxPoolItem *pOldValue, const SfxPoolItem *pNewValue ) { Modify ( pOldValue, pNewValue ); } void SwClientNotifyCall( const SwModify& rModify, const SfxHint& rHint ) { SwClientNotify( rModify, rHint ); } const SwModify* GetRegisteredIn() const { return m_pRegisteredIn; } diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index e9f447e9425a..8e89c8f528b9 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -127,7 +127,7 @@ public: for (const_iterator it = begin() + aStartIdx; it != begin() + aEndIdx; ++it) delete *it; - this->erase( begin() + aStartIdx, begin() + aEndIdx); + erase( begin() + aStartIdx, begin() + aEndIdx); } size_t GetPos(Value const& p) const diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index ca2d34df61d2..0d9a988559c2 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -3625,14 +3625,14 @@ IdleTask::IdleTask() : flag( false ) bool IdleTask::GetFlag() { //returning the status of current flag - return this->flag; + return flag; } //Callback function of IdleTask Class IMPL_LINK(IdleTask, FlipFlag, Timer*, , void) { //setting the flag to make sure that low priority idle task has been dispatched - this->flag = true; + flag = true; } void SwUiWriterTest::testDocModState() diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index e0f1d8e12ed0..057ba46d3827 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -371,7 +371,7 @@ namespace sw { namespace mark { // TODO: Does exist a better solution to trigger a format of the // fieldmark portion? If yes, please use it. - SwPaM aPaM( this->GetMarkPos(), this->GetOtherMarkPos() ); + SwPaM aPaM( GetMarkPos(), GetOtherMarkPos() ); aPaM.InvalidatePaM(); } @@ -417,7 +417,7 @@ namespace sw { namespace mark // For some reason the end mark is moved from 1 by the Insert: we don't // want this for checkboxes - SwPosition aNewEndPos = this->GetMarkEnd(); + SwPosition aNewEndPos = GetMarkEnd(); aNewEndPos.nContent--; SetMarkEndPos( aNewEndPos ); } diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 18fc17769dfc..d910d7e2050e 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -1013,7 +1013,7 @@ OUString SwPaM::GetText() const void SwPaM::InvalidatePaM() { - const SwNode &_pNd = this->GetNode(); + const SwNode &_pNd = GetNode(); const SwTextNode *_pTextNd = _pNd.GetTextNode(); if (_pTextNd != nullptr) { diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 8c7be64c3763..f505955e1a68 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -989,10 +989,10 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu // copy the pagedesc from the current document to the new // document and change the name of the to-be-applied style OUString sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo ); - pTargetPageDesc = this->MakePageDesc( sNewPageDescName ); + pTargetPageDesc = MakePageDesc( sNewPageDescName ); if( pTargetPageDesc ) { - this->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, false ); + CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, false ); lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo ); } } @@ -1074,8 +1074,8 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, sal_uInt16 const nStartPageNu << " " << aCpyPam.GetNode().GetIndex() << ")" ); #endif - this->GetIDocumentUndoRedo().StartUndo( SwUndoId::INSGLOSSARY, nullptr ); - this->getIDocumentFieldsAccess().LockExpFields(); + GetIDocumentUndoRedo().StartUndo( SwUndoId::INSGLOSSARY, nullptr ); + getIDocumentFieldsAccess().LockExpFields(); // Position where the appended doc starts. Will be filled in later. // Initially uses GetEndOfContent() because SwNodeIndex has no default ctor. @@ -1213,11 +1213,11 @@ else << " => " << aAnchor.GetPageNum() + pageOffset ); if ( pageOffset != 0 ) aAnchor.SetPageNum( aAnchor.GetPageNum() + pageOffset ); - this->getIDocumentLayoutAccess().CopyLayoutFormat( rCpyFormat, aAnchor, true, true ); + getIDocumentLayoutAccess().CopyLayoutFormat( rCpyFormat, aAnchor, true, true ); } } - this->GetIDocumentUndoRedo().EndUndo( SwUndoId::INSGLOSSARY, nullptr ); + GetIDocumentUndoRedo().EndUndo( SwUndoId::INSGLOSSARY, nullptr ); getIDocumentFieldsAccess().UnlockExpFields(); getIDocumentFieldsAccess().UpdateFields(false); diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 575a16bbf96c..dd34c7002f26 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -772,7 +772,7 @@ void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName, SwFlyFrameFormat* pFormat = nullptr; SET_CURR_SHELL( this ); StartAllAction(); - SwShellCursor *pStartCursor = dynamic_cast<SwShellCursor*>(this->GetSwCursor()); + SwShellCursor *pStartCursor = dynamic_cast<SwShellCursor*>(GetSwCursor()); SwShellCursor *pCursor = pStartCursor; do { diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 62ce2de3feae..e2a3e190c0f7 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -453,7 +453,7 @@ public: method replaced 'old' method <bool IsMoveable() const>. Determines, if frame is moveable in given environment. if no environment is given (parameter _pLayoutFrame == 0L), the movability in the actual - environment (<this->GetUpper()) is checked. + environment (<GetUpper()) is checked. @param _pLayoutFrame input parameter - given environment (layout frame), in which the movability diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index b51da88350cd..36a4e5e36eca 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -925,9 +925,9 @@ bool SwTextNode::IsCollapse() const const SwEndNode *pNdAfter=GetNodes()[nIdx+1]->GetEndNode(); // The paragraph is collapsed only if the NdAfter is the end of a cell - bool bInTable = this->FindTableNode( ) != nullptr; + bool bInTable = FindTableNode( ) != nullptr; - SwSortedObjs* pObjs = this->getLayoutFrame( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )->GetDrawObjs( ); + SwSortedObjs* pObjs = getLayoutFrame( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() )->GetDrawObjs( ); const size_t nObjs = ( pObjs != nullptr ) ? pObjs->size( ) : 0; return pNdBefore!=nullptr && pNdAfter!=nullptr && nObjs == 0 && bInTable; diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index b4e61b7a19f4..8aef88ce2d1c 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -1282,7 +1282,7 @@ static bool lcl_IsInSectionDirectly( const SwFrame *pUp ) method replaced 'old' method <sal_Bool IsMoveable() const>. Determines, if frame is moveable in given environment. if no environment is given (parameter _pLayoutFrame == 0L), the movability in the actual - environment (<this->GetUpper()) is checked. + environment (<GetUpper()) is checked. */ bool SwFrame::IsMoveable( const SwLayoutFrame* _pLayoutFrame ) const { diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 4de02e342015..ddefc54aecdf 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -489,7 +489,7 @@ void SwRootFrame::Init( SwFrameFormat* pFormat ) const IDocumentSettingAccess& rSettingAccess = pFormat->getIDocumentSettingAccess(); rTimerAccess.StopIdling(); // For creating the Flys by MakeFrames() - rLayoutAccess.SetCurrentViewShell( this->GetCurrShell() ); + rLayoutAccess.SetCurrentViewShell( GetCurrShell() ); mbCallbackActionEnabled = false; // needs to be set to true before leaving! SwDrawModel* pMd = pFormat->getIDocumentDrawModelAccess().GetDrawModel(); @@ -631,12 +631,12 @@ void SwRootFrame::RemoveMasterObjs( SdrPage *pPg ) void SwRootFrame::AllCheckPageDescs() const { if ( !IsLayoutFreezed() ) - CheckPageDescs( const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(this->Lower())) ); + CheckPageDescs( const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(Lower())) ); } void SwRootFrame::AllInvalidateAutoCompleteWords() const { - SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(this->Lower())); + SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(Lower())); while ( pPage ) { pPage->InvalidateAutoCompleteWords(); @@ -646,7 +646,7 @@ void SwRootFrame::AllInvalidateAutoCompleteWords() const void SwRootFrame::AllAddPaintRect() const { - GetCurrShell()->AddPaintRect( this->Frame() ); + GetCurrShell()->AddPaintRect( Frame() ); } void SwRootFrame::AllRemoveFootnotes() @@ -656,7 +656,7 @@ void SwRootFrame::AllRemoveFootnotes() void SwRootFrame::AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const { - SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(this->Lower())); + SwPageFrame *pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(Lower())); while ( pPage ) { if ( bSmartTags ) diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index d7215c74fd96..fb31aae370ce 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -951,10 +951,10 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowK // #i26745# - format row and cell frames of table { - this->Lower()->InvalidatePos_(); + Lower()->InvalidatePos_(); // #i43913# - correction // call method <lcl_InnerCalcLayout> with first lower. - lcl_InnerCalcLayout( this->Lower(), LONG_MAX, true ); + lcl_InnerCalcLayout( Lower(), LONG_MAX, true ); } //In order to be able to compare the positions of the cells with CutPos, diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 999bc8897c1d..d2c7a62111e8 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1609,7 +1609,7 @@ bool SwRootFrame::IsDummyPage( sal_uInt16 nPageNum ) const */ bool SwFrame::IsProtected() const { - if (this->IsContentFrame() && static_cast<const SwContentFrame*>(this)->GetNode()) + if (IsContentFrame() && static_cast<const SwContentFrame*>(this)->GetNode()) { const SwDoc *pDoc=static_cast<const SwContentFrame*>(this)->GetNode()->GetDoc(); bool isFormProtected=pDoc->GetDocumentSettingManager().get(DocumentSettingId::PROTECT_FORM ); diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 0e7b5e97c1eb..e6a8ab110248 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -59,7 +59,7 @@ SwFieldPortion *SwFieldPortion::Clone( const OUString &rExpand ) const // pass placeholder property to created <SwFieldPortion> instance. SwFieldPortion* pClone = new SwFieldPortion( rExpand, pNewFnt, bPlaceHolder ); pClone->SetNextOffset( nNextOffset ); - pClone->m_bNoLength = this->m_bNoLength; + pClone->m_bNoLength = m_bNoLength; return pClone; } diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 588bf06dd58c..c40d9cff79c5 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -280,7 +280,7 @@ bool SwTextFrame::FormatEmpty() { OSL_ENSURE( ! IsVertical() || ! IsSwapped(),"SwTextFrame::FormatEmpty with swapped frame" ); - bool bCollapse = EmptyHeight( ) == 1 && this->IsCollapse( ); + bool bCollapse = EmptyHeight( ) == 1 && IsCollapse( ); if ( HasFollow() || GetTextNode()->GetpSwpHints() || nullptr != GetTextNode()->GetNumRule() || diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index d2099dff14b2..b2721257dd6c 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -664,7 +664,7 @@ void Meta::NotifyChangeTextNode(SwTextNode *const pTextNode) { SwPtrMsgPoolItem aMsgHint( RES_REMOVE_UNO_OBJECT, &static_cast<SwModify&>(*this) ); // cast to base class! - this->Modify(&aMsgHint, &aMsgHint); + Modify(&aMsgHint, &aMsgHint); } } diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index ade444d30f54..83ebfe995a46 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -386,7 +386,7 @@ SwContentNode *SwTextNode::SplitContentNode( const SwPosition &rPos ) pNode->RegisterAsCopyOf(*this, true); if (nSplitPos == nTextLen) { - this->RemoveMetadataReference(); + RemoveMetadataReference(); // NB: SwUndoSplitNode will call pNode->JoinNext, // which is sufficient even in this case! } @@ -642,7 +642,7 @@ SwContentNode *SwTextNode::JoinNext() sal_Int32 nOldLen = m_Text.getLength(); // METADATA: merge - this->JoinMetadatable(*pTextNode, !this->Len(), !pTextNode->Len()); + JoinMetadatable(*pTextNode, !Len(), !pTextNode->Len()); SwWrongList *pList = GetWrong(); if( pList ) @@ -1682,12 +1682,12 @@ void SwTextNode::CopyText( SwTextNode *const pDest, sal_Int32 nTextStartIdx = rStart.GetIndex(); sal_Int32 nDestStart = rDestStart.GetIndex(); // remember old Pos - if (pDest->GetDoc()->IsClipBoard() && this->GetNum()) + if (pDest->GetDoc()->IsClipBoard() && GetNum()) { // #i111677# cache expansion of source (for clipboard) pDest->m_pNumStringCache.reset( (nTextStartIdx != 0) ? new OUString // fdo#49076: numbering only if copy from para start - : new OUString(this->GetNumString())); + : new OUString(GetNumString())); } if( !nLen ) diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index cff01e15c9a6..5aef3386aa1c 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -489,7 +489,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr if (rPropertyNames.getLength() != rValues.getLength()) throw lang::IllegalArgumentException(); - SwUnoCursor& rUnoCursor = this->GetCursor(); + SwUnoCursor& rUnoCursor = GetCursor(); sal_Int32 nProps = rPropertyNames.getLength(); const OUString *pProp = rPropertyNames.getConstArray(); @@ -580,7 +580,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: { SolarMutexGuard aGuard; - SwUnoCursor& rUnoCursor = this->GetCursor(); + SwUnoCursor& rUnoCursor = GetCursor(); std::vector< beans::GetDirectPropertyTolerantResult > aResultVector; diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 675b98813150..a01ebcbd3179 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -1534,7 +1534,7 @@ SwXMetaField::getPresentation(sal_Bool bShowCommand) else { // getString should check if this is invalid - const OUString content( this->getString() ); + const OUString content( getString() ); OUString prefix; OUString suffix; getPrefixAndSuffix(GetModel(), this, &prefix, &suffix); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index fc83c2a1326a..78ed4b2b7850 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2093,7 +2093,7 @@ void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat OutCSS1_SvxBox(*this, rFrameFormat.GetBox()); if (!m_bFirstCSS1Property) { - this->Strm().WriteChar( cCSS1_style_opt_end ); + Strm().WriteChar( cCSS1_style_opt_end ); } } diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 2e23384246d2..358ec557446c 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -152,7 +152,7 @@ void SwGlossaryGroupDlg::Apply() const OUString sMsg(SwResId(STR_QUERY_DELETE_GROUP1) + sTitle + SwResId(STR_QUERY_DELETE_GROUP2)); - ScopedVclPtrInstance< QueryBox > aQuery(this->GetParent(), WB_YES_NO|WB_DEF_NO, sMsg ); + ScopedVclPtrInstance< QueryBox > aQuery(GetParent(), WB_YES_NO|WB_DEF_NO, sMsg ); if(RET_YES == aQuery->Execute()) pGlosHdl->DelGroup( sDelGroup ); } diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 7ee772395282..f2a98831641f 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -365,7 +365,7 @@ void SwSortDlg::Apply() } if( !bRet ) - ScopedVclPtrInstance<MessageDialog>(this->GetParent(), SwResId(STR_SRTERR), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(GetParent(), SwResId(STR_SRTERR), VclMessageType::Info)->Execute(); } IMPL_LINK( SwSortDlg, DelimHdl, Button*, pButton, void ) diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx index 4ede6d755fe7..d4af4906b67a 100644 --- a/sw/source/uibase/uiview/formatclipboard.cxx +++ b/sw/source/uibase/uiview/formatclipboard.cxx @@ -277,7 +277,7 @@ bool SwFormatClipboard::CanCopyThisType( SelectionType nSelectionType ) void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bPersistentCopy ) { // first clear the previously stored attributes - this->Erase(); + Erase(); m_bPersistentCopy = bPersistentCopy; SelectionType nSelectionType = rWrtShell.GetSelectionType(); @@ -459,10 +459,10 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo , bool bNoCharacterFormats, bool bNoParagraphFormats ) { SelectionType nSelectionType = rWrtShell.GetSelectionType(); - if( !this->HasContentForThisType(nSelectionType) ) + if( !HasContentForThisType(nSelectionType) ) { if(!m_bPersistentCopy) - this->Erase(); + Erase(); return; } @@ -576,7 +576,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo rWrtShell.EndAction(); if(!m_bPersistentCopy) - this->Erase(); + Erase(); } void SwFormatClipboard::Erase() diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index 2db5c6f2cd17..902d64b79f63 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -74,7 +74,7 @@ void ScrollableDialog::setScrollVisibility( ScrollBarVisibility rVisState ) maVScrollBar->Show(); } if ( mbHasHoriBar || mbHasVertBar ) - this->SetStyle( Dialog::GetStyle() | WB_CLIPCHILDREN | WB_AUTOSIZE ); + SetStyle( Dialog::GetStyle() | WB_CLIPCHILDREN | WB_AUTOSIZE ); } ScrollableDialog::~ScrollableDialog() diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 8c8d294f1164..7658ca86d2da 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -747,7 +747,7 @@ void SvStream::StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ) bool bTryUtf8 = false; sal_uInt16 nFlag(0); sal_sSize nBack = sizeof(nFlag); - this->ReadUInt16( nFlag ); + ReadUInt16( nFlag ); switch ( nFlag ) { case 0xfeff : @@ -784,7 +784,7 @@ void SvStream::StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ) { unsigned char nChar(0); nBack += sizeof(nChar); - this->ReadUChar( nChar ); + ReadUChar( nChar ); if (nChar == 0xbf) nBack = 0; // it is UTF-8 } diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index 11fe708fe902..8bd5a3eb7584 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -695,7 +695,7 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); Reference< XNodeList > const xRet( - new CElementList(this->GetDocumentElement(), m_Mutex, rTagname)); + new CElementList(GetDocumentElement(), m_Mutex, rTagname)); return xRet; } @@ -705,7 +705,7 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); Reference< XNodeList > const xRet( - new CElementList(this->GetDocumentElement(), m_Mutex, + new CElementList(GetDocumentElement(), m_Mutex, rLocalName, &rNamespaceURI)); return xRet; } diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx index dd314371578f..33aaa797f8d9 100644 --- a/vcl/inc/unx/printergfx.hxx +++ b/vcl/inc/unx/printergfx.hxx @@ -85,7 +85,7 @@ public: { return mnBlue; } bool operator== (const PrinterColor& aColor) const { - return aColor.Is() && this->Is() + return aColor.Is() && Is() && mnRed == aColor.mnRed && mnGreen == aColor.mnGreen && mnBlue == aColor.mnBlue; diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index 3706c090a703..dc47f66d82b1 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -167,7 +167,7 @@ void NotebookBar::DataChanged(const DataChangedEvent& rDCEvt) void NotebookBar::UpdateBackground() { - const StyleSettings& rStyleSettings = this->GetSettings().GetStyleSettings(); + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const BitmapEx aPersona = rStyleSettings.GetPersonaHeader(); if (!aPersona.IsEmpty()) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 18feeba92bb6..6f1282736c5f 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -748,7 +748,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd, double deltaXInPixels = double(deltaPoint.X()); double deltaYInPixels = double(deltaPoint.Y()); - Size winSize = this->GetOutputSizePixel(); + Size winSize = GetOutputSizePixel(); if(pHScrl) { diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index df5ea054809a..32f0204fdae6 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -993,7 +993,7 @@ struct PDFNewJobParameters bool operator!=(const PDFNewJobParameters& rComp) const { - return ! this->operator==(rComp); + return ! operator==(rComp); } }; diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index 092ae9cc9289..debc48c0d5e0 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -96,9 +96,9 @@ public: Generator exporter; exporter.addDocumentHandler(&aHandler, ODF_FLAT_XML); - this->doRegisterHandlers(exporter); + doRegisterHandlers(exporter); - return this->doImportDocument(input, exporter, aDescriptor); + return doImportDocument(input, exporter, aDescriptor); } virtual void SAL_CALL cancel() override @@ -136,7 +136,7 @@ public: WPXSvInputStream input(xInputStream); - if (this->doDetectFormat(input, sTypeName)) + if (doDetectFormat(input, sTypeName)) { assert(!sTypeName.isEmpty()); diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index eb5dd9d37d31..6bf8f42fad2f 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -298,7 +298,7 @@ sal_Bool MSWorksCalcImportFilter::filter(const css::uno::Sequence< css::beans::P writerperfect::WPXSvInputStream input(xInputStream); OdsGenerator exporter; exporter.addDocumentHandler(&aHandler, ODF_FLAT_XML); - this->doRegisterHandlers(exporter); + doRegisterHandlers(exporter); utl::MediaDescriptor aDescriptor(rDescriptor); try @@ -352,7 +352,7 @@ sal_Bool MSWorksCalcImportFilter::filter(const css::uno::Sequence< css::beans::P bool needEncoding; const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&structuredInput, kind, creator, needEncoding); if (confidence!=libwps::WPS_CONFIDENCE_NONE) - return this->doImportDocument(structuredInput, exporter, aDescriptor); + return doImportDocument(structuredInput, exporter, aDescriptor); } } } @@ -361,7 +361,7 @@ sal_Bool MSWorksCalcImportFilter::filter(const css::uno::Sequence< css::beans::P { } - return this->doImportDocument(input, exporter, aDescriptor); + return doImportDocument(input, exporter, aDescriptor); } bool MSWorksCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 6e8670d4d4d2..e63bb1fae8d7 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -796,7 +796,7 @@ OUString SvXMLUnitConverter::encodeStyleName( { if (!m_pImpl->m_xCharClass.is()) { - this->m_pImpl->m_xCharClass = CharacterClassification::create( m_pImpl->m_xContext ); + m_pImpl->m_xCharClass = CharacterClassification::create( m_pImpl->m_xContext ); } sal_Int16 nType = m_pImpl->m_xCharClass->getType(rName, i); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 19ac452fb2a7..0d0c02a9daa6 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2649,7 +2649,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) if( !aAuthor.isEmpty() ) { SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, XML_CREATOR, true, false ); - this->Characters(aAuthor); + Characters(aAuthor); } // initials @@ -2658,7 +2658,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) { SvXMLElementExport aInitialsElem( *this, XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, true, false ); - this->Characters(aInitials); + Characters(aInitials); } { @@ -2671,7 +2671,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) css::uno::Reference < css::text::XText > xText( xAnnotation->getTextRange() ); if( xText.is() ) - this->GetTextParagraphExport()->exportText( xText ); + GetTextParagraphExport()->exportText( xText ); } while( xAnnotationEnumeration->hasMoreElements() ); } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 5ca9e5953892..e6ce3a0c453c 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1165,7 +1165,7 @@ XMLTextParagraphExport::XMLTextParagraphExport( pBoundFrameSets(new BoundFrameSets(GetExport().GetModel())), pFieldExport( nullptr ), pListElements( nullptr ), - maListAutoPool( this->GetExport() ), + maListAutoPool( GetExport() ), pSectionExport( nullptr ), pIndexMarkExport( nullptr ), pRedlineExport( nullptr ), diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 2ed07673a320..e583ff72dab1 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -948,14 +948,14 @@ SignatureInformations XSecController::getSignatureInformations() const void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking ) { - this->m_bIsBlocking = isBlocking; + m_bIsBlocking = isBlocking; checkChainingStatus(); } void SAL_CALL XSecController::collectionStatusChanged( sal_Bool isInsideCollectedElement ) { - this->m_bIsCollectingElement = isInsideCollectedElement; + m_bIsCollectingElement = isInsideCollectedElement; checkChainingStatus(); } diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 5273c1c444d3..91044a2c9d2f 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -906,7 +906,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() { * Adopt symmetric key into keys manager */ PK11SymKey* symKey = nullptr ; - for( unsigned int i = 0 ; ( symKey = this->getSymKey( i ) ) != nullptr ; i ++ ) { + for( unsigned int i = 0 ; ( symKey = getSymKey( i ) ) != nullptr ; i ++ ) { if( xmlSecNssAppliedKeysMngrSymKeyLoad( pKeysMngr, symKey ) < 0 ) { throw RuntimeException() ; } @@ -916,7 +916,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() { * Adopt asymmetric public key into keys manager */ SECKEYPublicKey* pubKey = nullptr ; - for( unsigned int i = 0 ; ( pubKey = this->getPubKey( i ) ) != nullptr ; i ++ ) { + for( unsigned int i = 0 ; ( pubKey = getPubKey( i ) ) != nullptr ; i ++ ) { if( xmlSecNssAppliedKeysMngrPubKeyLoad( pKeysMngr, pubKey ) < 0 ) { throw RuntimeException() ; } @@ -926,7 +926,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() { * Adopt asymmetric private key into keys manager */ SECKEYPrivateKey* priKey = nullptr ; - for( unsigned int i = 0 ; ( priKey = this->getPriKey( i ) ) != nullptr ; i ++ ) { + for( unsigned int i = 0 ; ( priKey = getPriKey( i ) ) != nullptr ; i ++ ) { if( xmlSecNssAppliedKeysMngrPriKeyLoad( pKeysMngr, priKey ) < 0 ) { throw RuntimeException() ; } |