diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-07 14:30:26 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-07 23:03:00 +0200 |
commit | bcf91144808232fa0d92184d2f1c09e5eaa1e86c (patch) | |
tree | a15f89af33c0f163a52ff57cb7b152b191f9b4ba /svl | |
parent | 6b40d5b2a340dced710ed66ed70cb7a670c5a4c1 (diff) |
Prefix SfxStyleSheetBase::pPool member
...just that one member; came in handy when researching a failure, and don't
want to loose that improvement.
Change-Id: Ia5434c4bd8131c37f93d32ce840859469ac258ef
Reviewed-on: https://gerrit.libreoffice.org/52553
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/items/style.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 7cfc727dc655..6ff9e7642297 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -101,7 +101,7 @@ public: SfxStyleSheetBase::SfxStyleSheetBase( const OUString& rName, SfxStyleSheetBasePool* p, SfxStyleFamily eFam, sal_uInt16 mask ) - : pPool( p ) + : m_pPool( p ) , nFamily( eFam ) , aName( rName ) , aParent() @@ -119,7 +119,7 @@ SfxStyleSheetBase::SfxStyleSheetBase( const OUString& rName, SfxStyleSheetBasePo SfxStyleSheetBase::SfxStyleSheetBase( const SfxStyleSheetBase& r ) : comphelper::OWeakTypeObject() - , pPool( r.pPool ) + , m_pPool( r.m_pPool ) , nFamily( r.nFamily ) , aName( r.aName ) , aParent( r.aParent ) @@ -166,25 +166,25 @@ bool SfxStyleSheetBase::SetName(const OUString& rName, bool bReIndexNow) if( aName != rName ) { OUString aOldName = aName; - SfxStyleSheetBase *pOther = pPool->Find( rName, nFamily ) ; + SfxStyleSheetBase *pOther = m_pPool->Find( rName, nFamily ) ; if ( pOther && pOther != this ) return false; - SfxStyleFamily eTmpFam = pPool->GetSearchFamily(); - sal_uInt16 nTmpMask = pPool->GetSearchMask(); + SfxStyleFamily eTmpFam = m_pPool->GetSearchFamily(); + sal_uInt16 nTmpMask = m_pPool->GetSearchMask(); - pPool->SetSearchMask(nFamily); + m_pPool->SetSearchMask(nFamily); if ( !aName.isEmpty() ) - pPool->ChangeParent( aName, rName, false ); + m_pPool->ChangeParent( aName, rName, false ); if ( aFollow == aName ) aFollow = rName; aName = rName; if (bReIndexNow) - pPool->Reindex(); - pPool->SetSearchMask(eTmpFam, nTmpMask); - pPool->Broadcast( SfxStyleSheetModifiedHint( aOldName, *this ) ); + m_pPool->Reindex(); + m_pPool->SetSearchMask(eTmpFam, nTmpMask); + m_pPool->Broadcast( SfxStyleSheetModifiedHint( aOldName, *this ) ); } return true; } @@ -202,7 +202,7 @@ bool SfxStyleSheetBase::SetParent( const OUString& rName ) if( aParent != rName ) { - SfxStyleSheetBase* pIter = pPool->Find(rName, nFamily); + SfxStyleSheetBase* pIter = m_pPool->Find(rName, nFamily); if( !rName.isEmpty() && !pIter ) { OSL_FAIL( "StyleSheet-Parent not found" ); @@ -215,19 +215,19 @@ bool SfxStyleSheetBase::SetParent( const OUString& rName ) { if(pIter->GetName() == aName) return false; - pIter = pPool->Find(pIter->GetParent(), nFamily); + pIter = m_pPool->Find(pIter->GetParent(), nFamily); } } aParent = rName; } - pPool->Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *this ) ); + m_pPool->Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *this ) ); return true; } void SfxStyleSheetBase::SetHidden( bool hidden ) { bHidden = hidden; - pPool->Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *this ) ); + m_pPool->Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *this ) ); } /** @@ -242,14 +242,14 @@ bool SfxStyleSheetBase::SetFollow( const OUString& rName ) { if( aFollow != rName ) { - if( !pPool->Find( rName, nFamily ) ) + if( !m_pPool->Find( rName, nFamily ) ) { SAL_WARN( "svl.items", "StyleSheet-Follow not found" ); return false; } aFollow = rName; } - pPool->Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *this ) ); + m_pPool->Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *this ) ); return true; } @@ -261,7 +261,7 @@ SfxItemSet& SfxStyleSheetBase::GetItemSet() { if( !pSet ) { - pSet = new SfxItemSet( pPool->GetPool() ); + pSet = new SfxItemSet( m_pPool->GetPool() ); bMySet = true; } return *pSet; @@ -337,7 +337,7 @@ OUString SfxStyleSheetBase::GetDescription( MapUnit eMetric ) OUString aItemPresentation; if ( !IsInvalidItem( pItem ) && - pPool->GetPool().GetPresentation( + m_pPool->GetPool().GetPresentation( *pItem, eMetric, aItemPresentation, aIntlWrapper ) ) { if ( !aDesc.isEmpty() && !aItemPresentation.isEmpty() ) @@ -870,14 +870,14 @@ bool SfxStyleSheet::SetParent( const OUString& rName ) // Remove from notification chain of the old parent if applicable if(!aOldParent.isEmpty()) { - SfxStyleSheet *pParent = static_cast<SfxStyleSheet *>(pPool->Find(aOldParent, nFamily)); + SfxStyleSheet *pParent = static_cast<SfxStyleSheet *>(m_pPool->Find(aOldParent, nFamily)); if(pParent) EndListening(*pParent); } // Add to the notification chain of the new parent if(!aParent.isEmpty()) { - SfxStyleSheet *pParent = static_cast<SfxStyleSheet *>(pPool->Find(aParent, nFamily)); + SfxStyleSheet *pParent = static_cast<SfxStyleSheet *>(m_pPool->Find(aParent, nFamily)); if(pParent) StartListening(*pParent); } |