diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-02 12:57:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-02 13:45:36 +0200 |
commit | 3dcf6dfceee58360501396390d78c006351aef47 (patch) | |
tree | 6e8cea499ee3a9543a03fd4a5321f5153c76cd65 /sfx2 | |
parent | 3b35bcf25fce566f91d084574650181ea791dff8 (diff) |
remove unnecessary use of 'this->'
Change-Id: I5c115389af7d24c18ddaf5fbec8c00f35017a5b4
Reviewed-on: https://gerrit.libreoffice.org/40671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appdispatchprovider.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/macroloader.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/Metadatable.cxx | 20 | ||||
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 |
4 files changed, 13 insertions, 13 deletions
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 ); |