[Libreoffice-commits] core.git: 4 commits - sw/inc sw/qa sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Nov 2 23:43:55 PST 2015
sw/inc/swatrset.hxx | 8 -
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 2
sw/source/core/attr/swatrset.cxx | 46 ++++----
sw/source/core/inc/frmtool.hxx | 20 +--
sw/source/core/layout/frmtool.cxx | 144 +++++++++++++-------------
sw/source/filter/ww8/rtfattributeoutput.cxx | 8 -
6 files changed, 114 insertions(+), 114 deletions(-)
New commits:
commit f72ddbb44280cf93ac348f39a75bdb29587180de
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 3 08:42:08 2015 +0100
sw: indentation fixes
Change-Id: I00bb0a4390524b569609d36d97120bdd2b55496e
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 6ba7ef7..a247b21 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -139,7 +139,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
DECLARE_OOXMLEXPORT_TEST(testFieldFlagO,"TOC_field_f.docx")
{
- // This test case is to verify \o flag should come once.
+ // This test case is to verify \o flag should come once.
xmlDocPtr pXmlDoc = parseExport();
if (!pXmlDoc)
return;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index b60ad04..39b8124 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -728,7 +728,7 @@ void RtfAttributeOutput::TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t p
m_aCells[nCurrentDepth] = pRow->GetCells().size();
for (sal_uInt32 i = 0; i < m_aCells[nCurrentDepth]; i++)
{
- const SwWriteTableCell *const pCell = pRow->GetCells()[ i ].get();
+ const SwWriteTableCell* const pCell = pRow->GetCells()[ i ].get();
const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
pTableTextNodeInfoInner->setCell(i);
@@ -756,7 +756,7 @@ void RtfAttributeOutput::TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer
const SwWriteTableRows& aRows = m_pTableWrt->GetRows();
SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ];
- const SwWriteTableCell *const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get();
+ const SwWriteTableCell* const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get();
const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
const SfxPoolItem* pItem;
if (pCellFormat->GetAttrSet().HasItem(RES_BOX, &pItem))
@@ -799,7 +799,7 @@ void RtfAttributeOutput::TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t
{
const SwWriteTableRows& aRows = m_pTableWrt->GetRows();
SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ];
- const SwWriteTableCell *const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get();
+ const SwWriteTableCell* const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get();
const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
const SfxPoolItem* pItem;
if (pCellFormat->GetAttrSet().HasItem(RES_BACKGROUND, &pItem))
@@ -879,7 +879,7 @@ void RtfAttributeOutput::TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t
{
const SwWriteTableRows& aRows = m_pTableWrt->GetRows();
SwWriteTableRow* pRow = aRows[ pTableTextNodeInfoInner->getRow() ];
- const SwWriteTableCell *const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get();
+ const SwWriteTableCell* const pCell = pRow->GetCells()[ pTableTextNodeInfoInner->getCell() ].get();
const SwFrameFormat* pCellFormat = pCell->GetBox()->GetFrameFormat();
const SfxPoolItem* pItem;
commit 8ea5e6c5cf01f8eac414d7d24d4fd98e9f4923aa
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 3 08:41:17 2015 +0100
sw: prefix members of SwFrmNotify
Change-Id: Idc0290d82bb51fec0fcc1db003bd48f3cc402a0f
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index d80fd0f..d40a2c4 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -173,14 +173,14 @@ void CalcContent( SwLayoutFrm *pLay,
class SwFrmNotify
{
protected:
- SwFrm *pFrm;
- const SwRect aFrm;
- const SwRect aPrt;
+ SwFrm *mpFrm;
+ const SwRect maFrm;
+ const SwRect maPrt;
SwTwips mnFlyAnchorOfst;
SwTwips mnFlyAnchorOfstNoWrap;
- bool bHadFollow;
- bool bInvaKeep;
- bool bValidSize;
+ bool mbHadFollow;
+ bool mbInvaKeep;
+ bool mbValidSize;
// #i49383#
bool mbFrmDeleted;
@@ -188,15 +188,15 @@ public:
SwFrmNotify( SwFrm *pFrm );
~SwFrmNotify();
- const SwRect &Frm() const { return aFrm; }
- void SetInvaKeep() { bInvaKeep = true; }
+ const SwRect &Frm() const { return maFrm; }
+ void SetInvaKeep() { mbInvaKeep = true; }
};
class SwLayNotify : public SwFrmNotify
{
bool bLowersComplete;
- SwLayoutFrm *GetLay() { return static_cast<SwLayoutFrm*>(pFrm); }
+ SwLayoutFrm *GetLay() { return static_cast<SwLayoutFrm*>(mpFrm); }
public:
SwLayNotify( SwLayoutFrm *pLayFrm );
@@ -210,7 +210,7 @@ class SwFlyNotify : public SwLayNotify
{
SwPageFrm *pOldPage;
const SwRect aFrmAndSpace;
- SwFlyFrm *GetFly() { return static_cast<SwFlyFrm*>(pFrm); }
+ SwFlyFrm *GetFly() { return static_cast<SwFlyFrm*>(mpFrm); }
public:
SwFlyNotify( SwFlyFrm *pFlyFrm );
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index b74a6cf..ce1db40 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -80,11 +80,11 @@ sal_uInt8 StackHack::nCnt = 0;
bool StackHack::bLocked = false;
SwFrmNotify::SwFrmNotify( SwFrm *pF ) :
- pFrm( pF ),
- aFrm( pF->Frm() ),
- aPrt( pF->Prt() ),
- bInvaKeep( false ),
- bValidSize( pF->GetValidSizeFlag() ),
+ mpFrm( pF ),
+ maFrm( pF->Frm() ),
+ maPrt( pF->Prt() ),
+ mbInvaKeep( false ),
+ mbValidSize( pF->GetValidSizeFlag() ),
mbFrmDeleted( false ) // #i49383#
{
if ( pF->IsTextFrm() )
@@ -98,7 +98,7 @@ SwFrmNotify::SwFrmNotify( SwFrm *pF ) :
mnFlyAnchorOfstNoWrap = 0;
}
- bHadFollow = pF->IsContentFrm() && static_cast<SwContentFrm*>(pF)->GetFollow();
+ mbHadFollow = pF->IsContentFrm() && static_cast<SwContentFrm*>(pF)->GetFollow();
}
SwFrmNotify::~SwFrmNotify()
@@ -109,27 +109,27 @@ SwFrmNotify::~SwFrmNotify()
return;
}
- SWRECTFN( pFrm )
- const bool bAbsP = POS_DIFF( aFrm, pFrm->Frm() );
+ SWRECTFN( mpFrm )
+ const bool bAbsP = POS_DIFF( maFrm, mpFrm->Frm() );
const bool bChgWidth =
- (aFrm.*fnRect->fnGetWidth)() != (pFrm->Frm().*fnRect->fnGetWidth)();
+ (maFrm.*fnRect->fnGetWidth)() != (mpFrm->Frm().*fnRect->fnGetWidth)();
const bool bChgHeight =
- (aFrm.*fnRect->fnGetHeight)()!=(pFrm->Frm().*fnRect->fnGetHeight)();
- const bool bChgFlyBasePos = pFrm->IsTextFrm() &&
- ( ( mnFlyAnchorOfst != static_cast<SwTextFrm*>(pFrm)->GetBaseOfstForFly( true ) ) ||
- ( mnFlyAnchorOfstNoWrap != static_cast<SwTextFrm*>(pFrm)->GetBaseOfstForFly( false ) ) );
+ (maFrm.*fnRect->fnGetHeight)()!=(mpFrm->Frm().*fnRect->fnGetHeight)();
+ const bool bChgFlyBasePos = mpFrm->IsTextFrm() &&
+ ( ( mnFlyAnchorOfst != static_cast<SwTextFrm*>(mpFrm)->GetBaseOfstForFly( true ) ) ||
+ ( mnFlyAnchorOfstNoWrap != static_cast<SwTextFrm*>(mpFrm)->GetBaseOfstForFly( false ) ) );
- if ( pFrm->IsFlowFrm() && !pFrm->IsInFootnote() )
+ if ( mpFrm->IsFlowFrm() && !mpFrm->IsInFootnote() )
{
- SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( pFrm );
+ SwFlowFrm *pFlow = SwFlowFrm::CastFlowFrm( mpFrm );
if ( !pFlow->IsFollow() )
{
- if ( !pFrm->GetIndPrev() )
+ if ( !mpFrm->GetIndPrev() )
{
- if ( bInvaKeep )
+ if ( mbInvaKeep )
{
- SwFrm *pPre = pFrm->FindPrev();
+ SwFrm *pPre = mpFrm->FindPrev();
if ( pPre && pPre->IsFlowFrm() )
{
// 1. pPre wants to keep with me:
@@ -154,8 +154,8 @@ SwFrmNotify::~SwFrmNotify()
}
else if ( !pFlow->HasFollow() )
{
- long nOldHeight = (aFrm.*fnRect->fnGetHeight)();
- long nNewHeight = (pFrm->Frm().*fnRect->fnGetHeight)();
+ long nOldHeight = (maFrm.*fnRect->fnGetHeight)();
+ long nNewHeight = (mpFrm->Frm().*fnRect->fnGetHeight)();
if( (nOldHeight > nNewHeight) || (!nOldHeight && nNewHeight) )
pFlow->CheckKeep();
}
@@ -164,9 +164,9 @@ SwFrmNotify::~SwFrmNotify()
if ( bAbsP )
{
- pFrm->SetCompletePaint();
+ mpFrm->SetCompletePaint();
- SwFrm* pNxt = pFrm->GetIndNext();
+ SwFrm* pNxt = mpFrm->GetIndNext();
// #121888# - skip empty section frames
while ( pNxt &&
pNxt->IsSctFrm() && !static_cast<SwSectionFrm*>(pNxt)->GetSection() )
@@ -180,49 +180,49 @@ SwFrmNotify::~SwFrmNotify()
{
// #104100# - correct condition for setting retouche
// flag for vertical layout.
- if( pFrm->IsRetoucheFrm() &&
- (aFrm.*fnRect->fnTopDist)( (pFrm->Frm().*fnRect->fnGetTop)() ) > 0 )
+ if( mpFrm->IsRetoucheFrm() &&
+ (maFrm.*fnRect->fnTopDist)( (mpFrm->Frm().*fnRect->fnGetTop)() ) > 0 )
{
- pFrm->SetRetouche();
+ mpFrm->SetRetouche();
}
// A fresh follow frame does not have to be invalidated, because
// it is already formatted:
- if ( bHadFollow || !pFrm->IsContentFrm() || !static_cast<SwContentFrm*>(pFrm)->GetFollow() )
+ if ( mbHadFollow || !mpFrm->IsContentFrm() || !static_cast<SwContentFrm*>(mpFrm)->GetFollow() )
{
- if ( !pFrm->IsTabFrm() || !static_cast<SwTabFrm*>(pFrm)->GetFollow() )
- pFrm->InvalidateNextPos();
+ if ( !mpFrm->IsTabFrm() || !static_cast<SwTabFrm*>(mpFrm)->GetFollow() )
+ mpFrm->InvalidateNextPos();
}
}
}
//For each resize of the background graphics is a repaint necessary.
const bool bPrtWidth =
- (aPrt.*fnRect->fnGetWidth)() != (pFrm->Prt().*fnRect->fnGetWidth)();
+ (maPrt.*fnRect->fnGetWidth)() != (mpFrm->Prt().*fnRect->fnGetWidth)();
const bool bPrtHeight =
- (aPrt.*fnRect->fnGetHeight)()!=(pFrm->Prt().*fnRect->fnGetHeight)();
+ (maPrt.*fnRect->fnGetHeight)()!=(mpFrm->Prt().*fnRect->fnGetHeight)();
if ( bPrtWidth || bPrtHeight )
{
//UUUU
bool bUseNewFillProperties(false);
- if (pFrm->supportsFullDrawingLayerFillAttributeSet())
+ if (mpFrm->supportsFullDrawingLayerFillAttributeSet())
{
- drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(pFrm->getSdrAllFillAttributesHelper());
+ drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes(mpFrm->getSdrAllFillAttributesHelper());
if(aFillAttributes.get() && aFillAttributes->isUsed())
{
bUseNewFillProperties = true;
//UUUU use SetCompletePaint if needed
if(aFillAttributes->needCompleteRepaint())
{
- pFrm->SetCompletePaint();
+ mpFrm->SetCompletePaint();
}
}
}
if (!bUseNewFillProperties)
{
- const SvxGraphicPosition ePos = pFrm->GetAttrSet()->GetBackground().GetGraphicPos();
+ const SvxGraphicPosition ePos = mpFrm->GetAttrSet()->GetBackground().GetGraphicPos();
if(GPOS_NONE != ePos && GPOS_TILED != ePos)
- pFrm->SetCompletePaint();
+ mpFrm->SetCompletePaint();
}
}
else
@@ -232,28 +232,28 @@ SwFrmNotify::~SwFrmNotify()
// in order to force paint of the margin areas.
if ( !bAbsP && (bChgWidth || bChgHeight) )
{
- pFrm->SetCompletePaint();
+ mpFrm->SetCompletePaint();
}
}
- const bool bPrtP = POS_DIFF( aPrt, pFrm->Prt() );
+ const bool bPrtP = POS_DIFF( maPrt, mpFrm->Prt() );
if ( bAbsP || bPrtP || bChgWidth || bChgHeight ||
bPrtWidth || bPrtHeight || bChgFlyBasePos )
{
- if( pFrm->IsAccessibleFrm() )
+ if( mpFrm->IsAccessibleFrm() )
{
- SwRootFrm *pRootFrm = pFrm->getRootFrm();
+ SwRootFrm *pRootFrm = mpFrm->getRootFrm();
if( pRootFrm && pRootFrm->IsAnyShellAccessible() &&
pRootFrm->GetCurrShell() )
{
- pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pFrm, aFrm );
+ pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( mpFrm, maFrm );
}
}
// Notification of anchored objects
- if ( pFrm->GetDrawObjs() )
+ if ( mpFrm->GetDrawObjs() )
{
- const SwSortedObjs &rObjs = *pFrm->GetDrawObjs();
+ const SwSortedObjs &rObjs = *mpFrm->GetDrawObjs();
SwPageFrm* pPageFrm = 0;
for ( size_t i = 0; i < rObjs.size(); ++i )
{
@@ -290,7 +290,7 @@ SwFrmNotify::~SwFrmNotify()
// determine page frame, if needed.
if ( !pPageFrm )
{
- pPageFrm = pFrm->FindPageFrm();
+ pPageFrm = mpFrm->FindPageFrm();
}
if ( pPageFrm != pFlyPageFrm )
{
@@ -370,13 +370,13 @@ SwFrmNotify::~SwFrmNotify()
}
}
}
- else if( pFrm->IsTextFrm() && bValidSize != pFrm->GetValidSizeFlag() )
+ else if( mpFrm->IsTextFrm() && mbValidSize != mpFrm->GetValidSizeFlag() )
{
- SwRootFrm *pRootFrm = pFrm->getRootFrm();
+ SwRootFrm *pRootFrm = mpFrm->getRootFrm();
if( pRootFrm && pRootFrm->IsAnyShellAccessible() &&
pRootFrm->GetCurrShell() )
{
- pRootFrm->GetCurrShell()->Imp()->InvalidateAccessibleFrmContent( pFrm );
+ pRootFrm->GetCurrShell()->Imp()->InvalidateAccessibleFrmContent( mpFrm );
}
}
@@ -384,7 +384,7 @@ SwFrmNotify::~SwFrmNotify()
SwFlyFrm* pFly = 0;
// #i35879# Do not trust the inf flags. pFrm does not
// necessarily have to have an upper!
- if ( !pFrm->IsFlyFrm() && 0 != ( pFly = pFrm->ImplFindFlyFrm() ) )
+ if ( !mpFrm->IsFlyFrm() && 0 != ( pFly = mpFrm->ImplFindFlyFrm() ) )
{
// #i61999#
// no invalidation of columned Writer fly frames, because automatic
@@ -461,7 +461,7 @@ SwLayNotify::~SwLayNotify()
SwLayoutFrm *pLay = GetLay();
SWRECTFN( pLay )
bool bNotify = false;
- if ( pLay->Prt().SSize() != aPrt.SSize() )
+ if ( pLay->Prt().SSize() != maPrt.SSize() )
{
if ( !IsLowersComplete() )
{
@@ -471,10 +471,10 @@ SwLayNotify::~SwLayNotify()
{
bInvaPercent = true;
long nNew = (pLay->Prt().*fnRect->fnGetHeight)();
- if( nNew != (aPrt.*fnRect->fnGetHeight)() )
+ if( nNew != (maPrt.*fnRect->fnGetHeight)() )
static_cast<SwRowFrm*>(pLay)->AdjustCells( nNew, true);
if( (pLay->Prt().*fnRect->fnGetWidth)()
- != (aPrt.*fnRect->fnGetWidth)() )
+ != (maPrt.*fnRect->fnGetWidth)() )
static_cast<SwRowFrm*>(pLay)->AdjustCells( 0, false );
}
else
@@ -505,26 +505,26 @@ SwLayNotify::~SwLayNotify()
if( pLay->Lower()->IsColumnFrm() && pLay->Lower()->GetNext() )
bLow = pLay->Lower()->Frm().Height() != pLay->Prt().Height();
else
- bLow = pLay->Prt().Width() != aPrt.Width();
+ bLow = pLay->Prt().Width() != maPrt.Width();
}
else
bLow = false;
}
else if( pLay->IsFooterFrm() && !pLay->HasFixSize() )
- bLow = pLay->Prt().Width() != aPrt.Width();
+ bLow = pLay->Prt().Width() != maPrt.Width();
else
bLow = true;
bInvaPercent = bLow;
if ( bLow )
{
- pLay->ChgLowersProp( aPrt.SSize() );
+ pLay->ChgLowersProp( maPrt.SSize() );
}
// If the PrtArea has been extended, it might be possible that the chain of parts
// can take another frame. As a result, the "possible right one" needs to be
// invalidated. This only pays off if this or its Uppers are moveable sections.
// A PrtArea has been extended if width or height are larger than before.
- if ( (pLay->Prt().Height() > aPrt.Height() ||
- pLay->Prt().Width() > aPrt.Width()) &&
+ if ( (pLay->Prt().Height() > maPrt.Height() ||
+ pLay->Prt().Width() > maPrt.Width()) &&
(pLay->IsMoveable() || pLay->IsFlyFrm()) )
{
SwFrm *pTmpFrm = pLay->Lower();
@@ -539,7 +539,7 @@ SwLayNotify::~SwLayNotify()
bNotify = true;
//EXPENSIVE!! But how we do it more elegant?
if( bInvaPercent )
- pLay->InvaPercentLowers( pLay->Prt().Height() - aPrt.Height() );
+ pLay->InvaPercentLowers( pLay->Prt().Height() - maPrt.Height() );
}
if ( pLay->IsTabFrm() )
//So that _only_ the shadow is drawn while resizing.
@@ -556,9 +556,9 @@ SwLayNotify::~SwLayNotify()
}
}
//Notify Lower if the position has changed.
- const bool bPrtPos = POS_DIFF( aPrt, pLay->Prt() );
- const bool bPos = bPrtPos || POS_DIFF( aFrm, pLay->Frm() );
- const bool bSize = pLay->Frm().SSize() != aFrm.SSize();
+ const bool bPrtPos = POS_DIFF( maPrt, pLay->Prt() );
+ const bool bPos = bPrtPos || POS_DIFF( maFrm, pLay->Frm() );
+ const bool bSize = pLay->Frm().SSize() != maFrm.SSize();
if ( bPos && pLay->Lower() && !IsLowersComplete() )
pLay->Lower()->InvalidatePos();
@@ -652,7 +652,7 @@ SwFlyNotify::~SwFlyNotify()
{
//If in the LayAction the IsAgain is set it can be
//that the old page is destroyed in the meantime!
- ::Notify( pFly, pOldPage, aFrmAndSpace, &aPrt );
+ ::Notify( pFly, pOldPage, aFrmAndSpace, &maPrt );
// #i35640# - additional notify anchor text frame,
// if Writer fly frame has changed its page
if ( pFly->GetAnchorFrm()->IsTextFrm() &&
@@ -667,14 +667,14 @@ SwFlyNotify::~SwFlyNotify()
//Have the size or the position changed,
//so should the view know this.
SWRECTFN( pFly )
- const bool bPosChgd = POS_DIFF( aFrm, pFly->Frm() );
- const bool bFrmChgd = pFly->Frm().SSize() != aFrm.SSize();
- const bool bPrtChgd = aPrt != pFly->Prt();
+ const bool bPosChgd = POS_DIFF( maFrm, pFly->Frm() );
+ const bool bFrmChgd = pFly->Frm().SSize() != maFrm.SSize();
+ const bool bPrtChgd = maPrt != pFly->Prt();
if ( bPosChgd || bFrmChgd || bPrtChgd )
{
pFly->NotifyDrawObj();
}
- if ( bPosChgd && aFrm.Pos().X() != FAR_AWAY )
+ if ( bPosChgd && maFrm.Pos().X() != FAR_AWAY )
{
// OD 2004-05-10 #i28701# - no direct move of lower Writer fly frames.
// reason: New positioning and alignment (e.g. to-paragraph anchored,
@@ -739,7 +739,7 @@ SwFlyNotify::~SwFlyNotify()
SwContentFrm *SwContentNotify::GetCnt()
{
- return static_cast<SwContentFrm*>(pFrm);
+ return static_cast<SwContentFrm*>(mpFrm);
}
SwContentNotify::SwContentNotify( SwContentFrm *pContentFrm ) :
@@ -781,8 +781,8 @@ SwContentNotify::~SwContentNotify()
pCnt->SetCompletePaint();
SWRECTFN( pCnt )
- if ( pCnt->IsInTab() && ( POS_DIFF( pCnt->Frm(), aFrm ) ||
- pCnt->Frm().SSize() != aFrm.SSize()))
+ if ( pCnt->IsInTab() && ( POS_DIFF( pCnt->Frm(), maFrm ) ||
+ pCnt->Frm().SSize() != maFrm.SSize()))
{
SwLayoutFrm* pCell = pCnt->GetUpper();
while( !pCell->IsCellFrm() && pCell->GetUpper() )
@@ -839,7 +839,7 @@ SwContentNotify::~SwContentNotify()
}
}
- const bool bFirst = (aFrm.*fnRect->fnGetWidth)() == 0;
+ const bool bFirst = (maFrm.*fnRect->fnGetWidth)() == 0;
if ( pCnt->IsNoTextFrm() )
{
@@ -854,9 +854,9 @@ SwContentNotify::~SwContentNotify()
pNd->IsOLESizeInvalid()) )
{
const bool bNoTextFrmPrtAreaChanged =
- ( aPrt.SSize().Width() != 0 &&
- aPrt.SSize().Height() != 0 ) &&
- aPrt.SSize() != pCnt->Prt().SSize();
+ ( maPrt.SSize().Width() != 0 &&
+ maPrt.SSize().Height() != 0 ) &&
+ maPrt.SSize() != pCnt->Prt().SSize();
OSL_ENSURE( pCnt->IsInFly(), "OLE not in FlyFrm" );
SwFlyFrm *pFly = pCnt->FindFlyFrm();
svt::EmbeddedObjectRef& xObj = pNd->GetOLEObj().GetObject();
@@ -969,7 +969,7 @@ SwContentNotify::~SwContentNotify()
}
// #i44049#
- if ( pCnt->IsTextFrm() && POS_DIFF( aFrm, pCnt->Frm() ) )
+ if ( pCnt->IsTextFrm() && POS_DIFF( maFrm, pCnt->Frm() ) )
{
pCnt->InvalidateObjs( true );
}
commit 4351703ccfba154af50c910e8cac548c48743e01
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 3 08:40:22 2015 +0100
sw: prefix members of SwAttrSet
Change-Id: I0f38c87d46f913a3bbb5f3e40b6ae71c515a8c9c
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 2d6fa61..72f01e7 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -173,7 +173,7 @@ public:
class SW_DLLPUBLIC SwAttrSet : public SfxItemSet
{
// Pointer for Modify-System
- SwAttrSet *pOldSet, *pNewSet;
+ SwAttrSet *m_pOldSet, *m_pNewSet;
// Notification-Callback
virtual void Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew ) override;
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 135e45a..d2f906f 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -145,17 +145,17 @@ void SwAttrPool::removeAndDeleteSecondaryPools()
}
SwAttrSet::SwAttrSet( SwAttrPool& rPool, sal_uInt16 nWh1, sal_uInt16 nWh2 )
- : SfxItemSet( rPool, nWh1, nWh2 ), pOldSet( 0 ), pNewSet( 0 )
+ : SfxItemSet( rPool, nWh1, nWh2 ), m_pOldSet( 0 ), m_pNewSet( 0 )
{
}
SwAttrSet::SwAttrSet( SwAttrPool& rPool, const sal_uInt16* nWhichPairTable )
- : SfxItemSet( rPool, nWhichPairTable ), pOldSet( 0 ), pNewSet( 0 )
+ : SfxItemSet( rPool, nWhichPairTable ), m_pOldSet( 0 ), m_pNewSet( 0 )
{
}
SwAttrSet::SwAttrSet( const SwAttrSet& rSet )
- : SfxItemSet( rSet ), pOldSet( 0 ), pNewSet( 0 )
+ : SfxItemSet( rSet ), m_pOldSet( 0 ), m_pNewSet( 0 )
{
}
@@ -194,30 +194,30 @@ SfxItemSet* SwAttrSet::Clone( bool bItems, SfxItemPool *pToPool ) const
bool SwAttrSet::Put_BC( const SfxPoolItem& rAttr,
SwAttrSet* pOld, SwAttrSet* pNew )
{
- pNewSet = pNew;
- pOldSet = pOld;
+ m_pNewSet = pNew;
+ m_pOldSet = pOld;
bool bRet = 0 != SfxItemSet::Put( rAttr );
- pOldSet = pNewSet = 0;
+ m_pOldSet = m_pNewSet = 0;
return bRet;
}
bool SwAttrSet::Put_BC( const SfxItemSet& rSet,
SwAttrSet* pOld, SwAttrSet* pNew )
{
- pNewSet = pNew;
- pOldSet = pOld;
+ m_pNewSet = pNew;
+ m_pOldSet = pOld;
bool bRet = SfxItemSet::Put( rSet );
- pOldSet = pNewSet = 0;
+ m_pOldSet = m_pNewSet = 0;
return bRet;
}
sal_uInt16 SwAttrSet::ClearItem_BC( sal_uInt16 nWhich,
SwAttrSet* pOld, SwAttrSet* pNew )
{
- pNewSet = pNew;
- pOldSet = pOld;
+ m_pNewSet = pNew;
+ m_pOldSet = pOld;
sal_uInt16 nRet = SfxItemSet::ClearItem( nWhich );
- pOldSet = pNewSet = 0;
+ m_pOldSet = m_pNewSet = 0;
return nRet;
}
@@ -225,32 +225,32 @@ sal_uInt16 SwAttrSet::ClearItem_BC( sal_uInt16 nWhich1, sal_uInt16 nWhich2,
SwAttrSet* pOld, SwAttrSet* pNew )
{
OSL_ENSURE( nWhich1 <= nWhich2, "no valid range" );
- pNewSet = pNew;
- pOldSet = pOld;
+ m_pNewSet = pNew;
+ m_pOldSet = pOld;
sal_uInt16 nRet = 0;
for( ; nWhich1 <= nWhich2; ++nWhich1 )
nRet = nRet + SfxItemSet::ClearItem( nWhich1 );
- pOldSet = pNewSet = 0;
+ m_pOldSet = m_pNewSet = 0;
return nRet;
}
int SwAttrSet::Intersect_BC( const SfxItemSet& rSet,
SwAttrSet* pOld, SwAttrSet* pNew )
{
- pNewSet = pNew;
- pOldSet = pOld;
+ m_pNewSet = pNew;
+ m_pOldSet = pOld;
SfxItemSet::Intersect( rSet );
- pOldSet = pNewSet = 0;
+ m_pOldSet = m_pNewSet = 0;
return pNew ? pNew->Count() : ( pOld ? pOld->Count() : 0 );
}
/// Notification callback
void SwAttrSet::Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew )
{
- if( pOldSet )
- pOldSet->PutChgd( rOld );
- if( pNewSet )
- pNewSet->PutChgd( rNew );
+ if( m_pOldSet )
+ m_pOldSet->PutChgd( rOld );
+ if( m_pNewSet )
+ m_pNewSet->PutChgd( rNew );
}
/** special treatment for some attributes
commit 561ce3f0566a4783678def80c0367345cb2abe60
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 3 08:37:52 2015 +0100
sw: prefix members of SwAttrPool
Change-Id: I3f55c4b8b12832b82e071d8cf62b2aa55f8913e7
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 2f6eaba..2d6fa61 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -157,7 +157,7 @@ private:
static sal_uInt16* pVersionMap6;
static sal_uInt16* pVersionMap7;
- SwDoc* pDoc;
+ SwDoc* m_pDoc;
public:
SwAttrPool( SwDoc* pDoc );
@@ -165,8 +165,8 @@ protected:
virtual ~SwAttrPool();
public:
- SwDoc* GetDoc() { return pDoc; }
- const SwDoc* GetDoc() const { return pDoc; }
+ SwDoc* GetDoc() { return m_pDoc; }
+ const SwDoc* GetDoc() const { return m_pDoc; }
};
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 1e83772..135e45a 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -49,7 +49,7 @@ SwAttrPool::SwAttrPool( SwDoc* pD )
: SfxItemPool( OUString("SWG"),
POOLATTR_BEGIN, POOLATTR_END-1,
aSlotTab, aAttrTab ),
- pDoc( pD )
+ m_pDoc( pD )
{
SetVersionMap( 1, 1, 60, pVersionMap1 );
SetVersionMap( 2, 1, 75, pVersionMap2 );
More information about the Libreoffice-commits
mailing list