From bb16c36512189c0ff0c72cdb49a7fd24ee8f474d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 29 Oct 2019 21:37:20 +0100 Subject: svx: prefix members of SdrModel See tdf#94879 for motivation. Change-Id: I08d77b07092894b67f33ce4cdbe29302b61121d3 Reviewed-on: https://gerrit.libreoffice.org/81717 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sd/inc/drawdoc.hxx | 4 ++-- sd/source/core/drawdoc.cxx | 38 +++++++++++++++++++------------------- sd/source/core/drawdoc2.cxx | 6 +++--- sd/source/core/drawdoc3.cxx | 4 ++-- sd/source/core/drawdoc4.cxx | 12 ++++++------ 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'sd') diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index e0deb23993ac..304d4e282c78 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -133,7 +133,7 @@ class SD_DLLPUBLIC SdDrawDocument : public FmFormModel public: SAL_DLLPRIVATE void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } SAL_DLLPRIVATE const OUString& getDocAccTitle() const { return msDocAccTitle; } - SAL_DLLPRIVATE bool getDocReadOnly() const { return bReadOnly; } + SAL_DLLPRIVATE bool getDocReadOnly() const { return m_bReadOnly; } private: OUString msDocAccTitle; std::unique_ptr @@ -245,7 +245,7 @@ public: SAL_DLLPRIVATE virtual bool IsReadOnly() const override; SAL_DLLPRIVATE virtual void SetChanged(bool bFlag = true) override; - SAL_DLLPRIVATE SfxItemPool& GetPool() { return( *pItemPool ); } + SAL_DLLPRIVATE SfxItemPool& GetPool() { return( *m_pItemPool ); } SAL_DLLPRIVATE SdOutliner* GetOutliner(bool bCreateOutliner=true); SdOutliner* GetInternalOutliner(bool bCreateOutliner=true); diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index fb040971caba..93074a90ce41 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -163,8 +163,8 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) SetScaleFraction(Fraction(1, 1)); SetDefaultFontHeight(847); // 24p - pItemPool->SetDefaultMetric(MapUnit::Map100thMM); - pItemPool->FreezeIdRanges(); + m_pItemPool->SetDefaultMetric(MapUnit::Map100thMM); + m_pItemPool->FreezeIdRanges(); SetTextDefaults(); // DrawingEngine has to know where it is... @@ -260,28 +260,28 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // Set the StyleSheetPool for HitTestOutliner. // The link to the StyleRequest handler of the document is set later, in // NewOrLoadCompleted, because only then do all the templates exist. - pHitTestOutliner->SetStyleSheetPool( static_cast(GetStyleSheetPool()) ); + m_pHitTestOutliner->SetStyleSheetPool( static_cast(GetStyleSheetPool()) ); - SetCalcFieldValueHdl( pHitTestOutliner.get() ); + SetCalcFieldValueHdl( m_pHitTestOutliner.get() ); try { Reference< XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() ); if ( xSpellChecker.is() ) - pHitTestOutliner->SetSpeller( xSpellChecker ); + m_pHitTestOutliner->SetSpeller( xSpellChecker ); Reference< XHyphenator > xHyphenator( LinguMgr::GetHyphenator() ); if( xHyphenator.is() ) - pHitTestOutliner->SetHyphenator( xHyphenator ); + m_pHitTestOutliner->SetHyphenator( xHyphenator ); } catch(...) { OSL_FAIL("Can't get SpellChecker"); } - pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); + m_pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); - EEControlBits nCntrl2 = pHitTestOutliner->GetControlWord(); + EEControlBits nCntrl2 = m_pHitTestOutliner->GetControlWord(); nCntrl2 |= EEControlBits::ALLOWBIGOBJS; nCntrl2 &= ~EEControlBits::ONLINESPELLING; @@ -289,7 +289,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) if ( pOptions->IsSummationOfParagraphs() ) nCntrl2 |= EEControlBits::ULSPACESUMMATION; - pHitTestOutliner->SetControlWord( nCntrl2 ); + m_pHitTestOutliner->SetControlWord( nCntrl2 ); /** Create layers * @@ -348,16 +348,16 @@ SdDrawDocument::~SdDrawDocument() ClearModel(true); - if (pLinkManager) + if (m_pLinkManager) { // Release BaseLinks - if ( !pLinkManager->GetLinks().empty() ) + if ( !m_pLinkManager->GetLinks().empty() ) { - pLinkManager->Remove( 0, pLinkManager->GetLinks().size() ); + m_pLinkManager->Remove( 0, m_pLinkManager->GetLinks().size() ); } - delete pLinkManager; - pLinkManager = nullptr; + delete m_pLinkManager; + m_pLinkManager = nullptr; } maFrameViewList.clear(); @@ -759,7 +759,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) // Initialize HitTestOutliner and DocumentOutliner, but don't initialize the // global outliner, as it is not document specific like StyleSheetPool and // StyleRequestHandler are. - pHitTestOutliner->SetStyleSheetPool(static_cast(GetStyleSheetPool())); + m_pHitTestOutliner->SetStyleSheetPool(static_cast(GetStyleSheetPool())); if(mpOutliner) { @@ -809,7 +809,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) /** updates all links, only links in this document should by resolved */ void SdDrawDocument::UpdateAllLinks() { - if (s_pDocLockedInsertingLinks || !pLinkManager || pLinkManager->GetLinks().empty()) + if (s_pDocLockedInsertingLinks || !m_pLinkManager || m_pLinkManager->GetLinks().empty()) return; s_pDocLockedInsertingLinks = this; // lock inserting links. only links in this document should by resolved @@ -820,7 +820,7 @@ void SdDrawDocument::UpdateAllLinks() rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true); } - pLinkManager->UpdateAllLinks(true, false, nullptr); // query box: update all links? + m_pLinkManager->UpdateAllLinks(true, false, nullptr); // query box: update all links? if (s_pDocLockedInsertingLinks == this) s_pDocLockedInsertingLinks = nullptr; // unlock inserting links @@ -914,7 +914,7 @@ SdOutliner* SdDrawDocument::GetOutliner(bool bCreateOutliner) if (mpDocSh) mpOutliner->SetRefDevice( SD_MOD()->GetVirtualRefDevice() ); - mpOutliner->SetDefTab( nDefaultTabulator ); + mpOutliner->SetDefTab( m_nDefaultTabulator ); mpOutliner->SetStyleSheetPool(static_cast(GetStyleSheetPool())); } @@ -938,7 +938,7 @@ SdOutliner* SdDrawDocument::GetInternalOutliner(bool bCreateOutliner) if (mpDocSh) mpInternalOutliner->SetRefDevice( SD_MOD()->GetVirtualRefDevice() ); - mpInternalOutliner->SetDefTab( nDefaultTabulator ); + mpInternalOutliner->SetDefTab( m_nDefaultTabulator ); mpInternalOutliner->SetStyleSheetPool(static_cast(GetStyleSheetPool())); } diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index cc27e8553d8e..5d4335a5c53d 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -839,7 +839,7 @@ bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage) // Return number of links in sfx2::LinkManager sal_uLong SdDrawDocument::GetLinkCount() const { - return pLinkManager->GetLinks().size(); + return m_pLinkManager->GetLinks().size(); } // Set Language @@ -866,8 +866,8 @@ void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId if( bChanged ) { GetDrawOutliner().SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); - pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); - pItemPool->SetPoolDefaultItem( SvxLanguageItem( eLang, nId ) ); + m_pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); + m_pItemPool->SetPoolDefaultItem( SvxLanguageItem( eLang, nId ) ); SetChanged( bChanged ); } } diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 626a7dfd79d0..99647b42aab0 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -427,9 +427,9 @@ bool SdDrawDocument::InsertBookmarkAsPage( // this will make copied masters to differ from the originals, // and thus InsertBookmarkAsPage_FindDuplicateLayouts will // duplicate masters on insert to same document - bTransportContainer = (SD_MOD()->pTransferClip && + m_bTransportContainer = (SD_MOD()->pTransferClip && SD_MOD()->pTransferClip->GetWorkDocument() == this); - if (!bTransportContainer) + if (!m_bTransportContainer) { if (rBookmarkList.empty()) bScaleObjects = pRefPage->IsScaleObjects(); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index be447edcef72..a8dd775a8cdd 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1236,7 +1236,7 @@ void SdDrawDocument::SetTextDefaults() const aBulletItem.SetStart(1); aBulletItem.SetScale(45); // In percent aBulletItem.SetSymbol( 0x25CF ); // In points - pItemPool->SetPoolDefaultItem( aBulletItem ); + m_pItemPool->SetPoolDefaultItem( aBulletItem ); // New BulletItem SvxNumberFormat aNumberFormat(SVX_NUM_CHAR_SPECIAL); @@ -1262,12 +1262,12 @@ void SdDrawDocument::SetTextDefaults() const } SvxNumBulletItem aNumBulletItem( aNumRule, EE_PARA_NUMBULLET ); - pItemPool->SetPoolDefaultItem( aNumBulletItem ); + m_pItemPool->SetPoolDefaultItem( aNumBulletItem ); } css::text::WritingMode SdDrawDocument::GetDefaultWritingMode() const { - const SfxPoolItem* pItem = ( pItemPool ? pItemPool->GetPoolDefaultItem( EE_PARA_WRITINGDIR ) : nullptr ); + const SfxPoolItem* pItem = ( m_pItemPool ? m_pItemPool->GetPoolDefaultItem( EE_PARA_WRITINGDIR ) : nullptr ); css::text::WritingMode eRet = css::text::WritingMode_LR_TB; if( pItem ) @@ -1289,7 +1289,7 @@ css::text::WritingMode SdDrawDocument::GetDefaultWritingMode() const void SdDrawDocument::SetDefaultWritingMode(css::text::WritingMode eMode ) { - if( !pItemPool ) + if( !m_pItemPool ) return; SvxFrameDirection nVal; @@ -1304,14 +1304,14 @@ void SdDrawDocument::SetDefaultWritingMode(css::text::WritingMode eMode ) } SvxFrameDirectionItem aModeItem( nVal, EE_PARA_WRITINGDIR ); - pItemPool->SetPoolDefaultItem( aModeItem ); + m_pItemPool->SetPoolDefaultItem( aModeItem ); SvxAdjustItem aAdjust( SvxAdjust::Left, EE_PARA_JUST ); if( eMode == css::text::WritingMode_RL_TB ) aAdjust.SetAdjust( SvxAdjust::Right ); - pItemPool->SetPoolDefaultItem( aAdjust ); + m_pItemPool->SetPoolDefaultItem( aAdjust ); } void SdDrawDocument::getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ) -- cgit