[Libreoffice-commits] core.git: 2 commits - clew/Library_clew.mk sw/source
Michael Stahl
mstahl at redhat.com
Wed Dec 17 07:20:11 PST 2014
clew/Library_clew.mk | 2 --
sw/source/core/inc/layfrm.hxx | 6 +++---
sw/source/core/layout/flowfrm.cxx | 8 ++++----
sw/source/core/layout/fly.cxx | 4 ++--
sw/source/core/layout/frmtool.cxx | 6 +++---
sw/source/core/layout/ftnfrm.cxx | 2 +-
sw/source/core/layout/sectfrm.cxx | 6 +++---
sw/source/core/layout/ssfrm.cxx | 8 ++++----
sw/source/core/layout/tabfrm.cxx | 4 ++--
sw/source/core/layout/wsfrm.cxx | 24 ++++++++++++------------
10 files changed, 34 insertions(+), 36 deletions(-)
New commits:
commit 7d70efaac360dbbd9bea2d51b1ae53b577fc6559
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Dec 17 16:14:11 2014 +0100
clew: there is no "clcc" UnpackedTarball
Change-Id: I63f3954546e656d37ed6e22efd75b16df9fbcbac
diff --git a/clew/Library_clew.mk b/clew/Library_clew.mk
index 2e1ed6f..014027c 100644
--- a/clew/Library_clew.mk
+++ b/clew/Library_clew.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Library_Library,clew))
-$(eval $(call gb_Library_use_unpacked,clew,clcc))
-
$(eval $(call gb_Library_add_defs,clew,\
-DCLEW_BUILD \
))
commit 26d8cd13344ff2457f888edb535ca0934b0be719
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Dec 17 15:10:14 2014 +0100
sw: prefix SwLayoutFrm::pLower
Change-Id: I844c00639307c14140ba7e8a1b919e3f2ecdc114
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index c4d3772..e47fbda 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -53,7 +53,7 @@ protected:
virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void MakeAll() SAL_OVERRIDE;
- SwFrm *pLower;
+ SwFrm * m_pLower;
std::vector<SwAnchoredObject*> aVertPosOrientFrmsFor;
virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
@@ -104,8 +104,8 @@ public:
virtual void Paint( SwRect const&,
SwPrintData const*const pPrintData = NULL ) const SAL_OVERRIDE;
- const SwFrm *Lower() const { return pLower; }
- SwFrm *Lower() { return pLower; }
+ const SwFrm *Lower() const { return m_pLower; }
+ SwFrm *Lower() { return m_pLower; }
const SwCntntFrm *ContainsCntnt() const;
inline SwCntntFrm *ContainsCntnt();
const SwCellFrm *FirstCell() const;
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 893875f..1094fcf 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -384,7 +384,7 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
// Just cut quickly and take care that we don't cause problems with the
// left-behinds. The pointers of the chain being cut can point who-knows where.
if ( pStart == pStart->GetUpper()->Lower() )
- pStart->GetUpper()->pLower = 0;
+ pStart->GetUpper()->m_pLower = nullptr;
if ( pStart->GetPrev() )
{
pStart->GetPrev()->mpNext = 0;
@@ -445,14 +445,14 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
if ( 0 != (pStart->mpPrev = pSibling->GetPrev()) )
pStart->GetPrev()->mpNext = pStart;
else
- pParent->pLower = pStart;
+ pParent->m_pLower = pStart;
pSibling->_InvalidatePos();
pSibling->_InvalidatePrt();
}
else
{
if ( 0 == (pStart->mpPrev = pParent->Lower()) )
- pParent->pLower = pStart;
+ pParent->m_pLower = pStart;
else
//Modified for #i100782#,04/03/2009
//If the pParent has more than 1 child nodes, former design will
@@ -462,7 +462,7 @@ bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm *pParent, SwFrm *pSibling,
//add the pStart after the last child.
// pParent->Lower()->pNext = pStart;
{
- SwFrm* pTemp = pParent->pLower;
+ SwFrm* pTemp = pParent->m_pLower;
while (pTemp)
{
if (pTemp->mpNext)
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 3a05a73..9c618e6 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -291,7 +291,7 @@ void SwFlyFrm::DeleteCnt()
if ( IsLockDeleteContent() )
return;
- SwFrm* pFrm = pLower;
+ SwFrm* pFrm = m_pLower;
while ( pFrm )
{
while ( pFrm->GetDrawObjs() && pFrm->GetDrawObjs()->size() )
@@ -323,7 +323,7 @@ void SwFlyFrm::DeleteCnt()
pFrm->Remove();
delete pFrm;
- pFrm = pLower;
+ pFrm = m_pLower;
}
InvalidatePage();
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 6a9c619..c6ba7c8 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2435,7 +2435,7 @@ SwFrm *SaveCntnt( SwLayoutFrm *pLay, SwFrm *pStart )
do
{
if( bGo )
- pFloat->GetUpper()->pLower = 0; // detach the chain part
+ pFloat->GetUpper()->m_pLower = nullptr; // detach the chain part
// search the end of the chain part, remove Flys on the way
do
@@ -2586,8 +2586,8 @@ void RestoreCntnt( SwFrm *pSav, SwLayoutFrm *pParent, SwFrm *pSibling, bool bGro
pSibling->Prepare( PREP_CLEAR, 0, false );
}
else
- { pNxt = pParent->pLower;
- pParent->pLower = pSav;
+ { pNxt = pParent->m_pLower;
+ pParent->m_pLower = pSav;
pSav->mpUpper = pParent; // set here already, so that it is explicit when invalidating
if ( pSav->IsCntntFrm() )
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index b138b93..a69534b 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -213,7 +213,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * )
{
// VarSize is determined based on the content plus the borders
SwTwips nRemaining = 0;
- SwFrm *pFrm = pLower;
+ SwFrm *pFrm = m_pLower;
while ( pFrm )
{ // lcl_Undersize(..) respects (recursively) TxtFrms, which
// would like to be bigger. They are created especially in
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index e48f780..dc14823 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1291,7 +1291,7 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
if ( !bMaximize )
{
SwTwips nRemaining = (this->*fnRect->fnGetTopMargin)();
- SwFrm *pFrm = pLower;
+ SwFrm *pFrm = m_pLower;
if( pFrm )
{
if( pFrm->IsColumnFrm() && pFrm->GetNext() )
@@ -1362,12 +1362,12 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
(Frm().*fnRect->fnAddBottom)( nTmp );
(this->*fnRect->fnSetYMargins)( nTop, 0 );
InvalidateNextPos();
- if( pLower && ( !pLower->IsColumnFrm() || !pLower->GetNext() ) )
+ if (m_pLower && (!m_pLower->IsColumnFrm() || !m_pLower->GetNext()))
{
// If a single-column section just created the space that
// was requested by the "undersized" paragraphs, then they
// have to be invalidated and calculated, so they fully cover it
- pFrm = pLower;
+ pFrm = m_pLower;
if( pFrm->IsColumnFrm() )
{
pFrm->_InvalidateSize();
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index f4831ed..06f6ee2 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -369,9 +369,9 @@ void SwFrm::Destroy()
}
SwLayoutFrm *pFrm = GetUpper();
- if (pFrm && pFrm->pLower == this)
+ if (pFrm && pFrm->m_pLower == this)
{
- pFrm->pLower = NULL;
+ pFrm->m_pLower = nullptr;
}
}
@@ -446,7 +446,7 @@ void SwLayoutFrm::Destroy()
assert(aVertPosOrientFrmsFor.empty());
- SwFrm *pFrm = pLower;
+ SwFrm *pFrm = m_pLower;
if( GetFmt() && !GetFmt()->GetDoc()->IsInDtor() )
{
@@ -488,7 +488,7 @@ void SwLayoutFrm::Destroy()
}
pFrm->Remove();
delete pFrm;
- pFrm = pLower;
+ pFrm = m_pLower;
}
//Delete the Flys, the last one also deletes the array.
while ( GetDrawObjs() && GetDrawObjs()->size() )
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index a260c4a..e3c4102 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2881,7 +2881,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
//The size is defined by the content plus the borders.
SwTwips nRemaining = 0, nDiff;
- SwFrm *pFrm = pLower;
+ SwFrm *pFrm = m_pLower;
while ( pFrm )
{
nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)();
@@ -3160,7 +3160,7 @@ bool SwTabFrm::GetInfo( SfxPoolItem &rHnt ) const
SwCntntFrm *SwTabFrm::FindLastCntnt()
{
- SwFrm *pRet = pLower;
+ SwFrm *pRet = m_pLower;
while ( pRet && !pRet->IsCntntFrm() )
{
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index be143fa..bc98ddf 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -536,7 +536,7 @@ void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
if( 0 != (mpPrev = pBehind->mpPrev) )
mpPrev->mpNext = this;
else
- mpUpper->pLower = this;
+ mpUpper->m_pLower = this;
pBehind->mpPrev = this;
}
else
@@ -549,7 +549,7 @@ void SwFrm::InsertBefore( SwLayoutFrm* pParent, SwFrm* pBehind )
mpPrev->mpNext = this;
}
else
- mpUpper->pLower = this;
+ mpUpper->m_pLower = this;
}
}
@@ -579,7 +579,7 @@ void SwFrm::InsertBehind( SwLayoutFrm *pParent, SwFrm *pBefore )
mpNext = pParent->Lower();
if ( pParent->Lower() )
pParent->Lower()->mpPrev = this;
- pParent->pLower = this;
+ pParent->m_pLower = this;
}
}
@@ -637,7 +637,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
if( pBehind->GetPrev() )
pBehind->GetPrev()->mpNext = NULL;
else
- pBehind->GetUpper()->pLower = NULL;
+ pBehind->GetUpper()->m_pLower = nullptr;
pBehind->mpPrev = NULL;
SwLayoutFrm* pTmp = static_cast<SwLayoutFrm*>(pSct);
if( pTmp->Lower() )
@@ -647,7 +647,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
OSL_ENSURE( pTmp, "InsertGrp: Missing ColBody" );
}
pBehind->mpUpper = pTmp;
- pBehind->GetUpper()->pLower = pBehind;
+ pBehind->GetUpper()->m_pLower = pBehind;
pLast = pBehind->GetNext();
while ( pLast )
{
@@ -676,7 +676,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
if( 0 != (mpPrev = pBehind->mpPrev) )
mpPrev->mpNext = this;
else
- mpUpper->pLower = this;
+ mpUpper->m_pLower = this;
pBehind->mpPrev = pLast;
}
else
@@ -690,7 +690,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm* pBehind, SwFrm* pSct )
mpPrev->mpNext = this;
}
else
- mpUpper->pLower = this;
+ mpUpper->m_pLower = this;
}
}
}
@@ -704,8 +704,8 @@ void SwFrm::Remove()
mpPrev->mpNext = mpNext;
else
{ // the first in a list is removed //TODO
- OSL_ENSURE( mpUpper->pLower == this, "Layout is inconsistent." );
- mpUpper->pLower = mpNext;
+ OSL_ENSURE( mpUpper->m_pLower == this, "Layout is inconsistent." );
+ mpUpper->m_pLower = mpNext;
}
if( mpNext )
mpNext->mpPrev = mpPrev;
@@ -2142,9 +2142,9 @@ void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew,
}
}
-SwLayoutFrm::SwLayoutFrm( SwFrmFmt* pFmt, SwFrm* pSib ):
- SwFrm( pFmt, pSib ),
- pLower( 0 )
+SwLayoutFrm::SwLayoutFrm(SwFrmFmt *const pFmt, SwFrm *const pSib)
+ : SwFrm(pFmt, pSib)
+ , m_pLower(nullptr)
{
const SwFmtFrmSize &rFmtSize = pFmt->GetFrmSize();
if ( rFmtSize.GetHeightSizeType() == ATT_FIX_SIZE )
More information about the Libreoffice-commits
mailing list