sw/source/core/crsr/findattr.cxx | 10 +-
sw/source/core/crsr/findcoll.cxx | 8 --
sw/source/core/draw/dflyobj.cxx | 24 +++---
sw/source/core/inc/dflyobj.hxx | 6 -
sw/source/core/text/widorp.cxx | 136 +++++++++++++++++++--------------------
sw/source/core/text/widorp.hxx | 14 ++--
6 files changed, 98 insertions(+), 100 deletions(-)
New commits:
commit f5c11ad18106f100b0fa3fc215540a037fb5d338
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Nov 16 10:55:38 2015 +0100
sw: Prefix a member in SwVirtFlyDrawObj.
Change-Id: I5514bf16446fa4e4c498a6bc1df77e4f59565ee1
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 3b9cf03..d03ca01 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -374,9 +374,9 @@ sdr::contact::ViewContact*
SwVirtFlyDrawObj::CreateObjectSpecificViewContact()
SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) :
SdrVirtObj( rNew ),
- pFlyFrm( pFly )
+ m_pFlyFrm( pFly )
{
- const SvxProtectItem &rP = pFlyFrm->GetFormat()->GetProtect();
+ const SvxProtectItem &rP = m_pFlyFrm->GetFormat()->GetProtect();
bMovProt = rP.IsPosProtected();
bSizProt = rP.IsSizeProtected();
}
@@ -444,7 +444,7 @@ namespace
void SwVirtFlyDrawObj::wrap_DoPaintObject(
drawinglayer::geometry::ViewInformation2D const& rViewInformation) const
{
- SwViewShell* pShell = pFlyFrm->getRootFrm()->GetCurrShell();
+ SwViewShell* pShell = m_pFlyFrm->getRootFrm()->GetCurrShell();
// Only paint when we have a current shell and a DrawingLayer paint is in
progress.
// This avoids evtl. problems with renderers which do processing stuff,
@@ -466,7 +466,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject(
// which is slow, wastes memory, and can cause other trouble.
(void) rViewInformation; // suppress "unused parameter" warning
assert(comphelper::LibreOfficeKit::isActive() ||
!rViewInformation.getViewport().isEmpty());
- if ( !pFlyFrm->IsFlyInCntFrm() )
+ if ( !m_pFlyFrm->IsFlyInCntFrm() )
{
// it is also necessary to restore the VCL MapMode from
ViewInformation since e.g.
// the VCL PixelRenderer resets it at the used OutputDevice.
Unfortunately, this
@@ -477,7 +477,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject(
RestoreMapMode aRestoreMapModeIfNeeded( pShell );
// paint the FlyFrame (use standard VCL-Paint)
- pFlyFrm->Paint( *pShell->GetOut(), GetFlyFrm()->Frm() );
+ m_pFlyFrm->Paint( *pShell->GetOut(), GetFlyFrm()->Frm() );
}
}
}
@@ -961,23 +961,23 @@ Pointer SwVirtFlyDrawObj::GetMacroPointer(
bool SwVirtFlyDrawObj::HasMacro() const
{
- const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL();
+ const SwFormatURL &rURL = m_pFlyFrm->GetFormat()->GetURL();
return rURL.GetMap() || !rURL.GetURL().isEmpty();
}
SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec )
const
{
- const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL();
+ const SwFormatURL &rURL = m_pFlyFrm->GetFormat()->GetURL();
if( rURL.GetMap() || !rURL.GetURL().isEmpty() )
{
SwRect aRect;
- if ( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() )
+ if ( m_pFlyFrm->Lower() && m_pFlyFrm->Lower()->IsNoTextFrm() )
{
- aRect = pFlyFrm->Prt();
- aRect += pFlyFrm->Frm().Pos();
+ aRect = m_pFlyFrm->Prt();
+ aRect += m_pFlyFrm->Frm().Pos();
}
else
- aRect = pFlyFrm->Frm();
+ aRect = m_pFlyFrm->Frm();
if( aRect.IsInside( rRec.aPos ) )
{
@@ -989,7 +989,7 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const
SdrObjMacroHitRec& rRec ) cons
if( aRect.IsInside( rRec.aPos ) )
{
if( !rURL.GetMap() ||
- pFlyFrm->GetFormat()->GetIMapObject( rRec.aPos, pFlyFrm ))
+ m_pFlyFrm->GetFormat()->GetIMapObject( rRec.aPos,
m_pFlyFrm ))
return const_cast<SdrObject*>(static_cast<SdrObject const
*>(this));
return nullptr;
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index c21fa1a..40eba19 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -60,7 +60,7 @@ public:
class SwVirtFlyDrawObj : public SdrVirtObj
{
private:
- SwFlyFrm *pFlyFrm;
+ SwFlyFrm *m_pFlyFrm;
protected:
// AW: Need own sdr::contact::ViewContact since AnchorPos from parent is
@@ -110,8 +110,8 @@ public:
SwFrameFormat *GetFormat();
// methods to get pointers for the Fly
- SwFlyFrm* GetFlyFrm() { return pFlyFrm; }
- const SwFlyFrm* GetFlyFrm() const { return pFlyFrm; }
+ SwFlyFrm* GetFlyFrm() { return m_pFlyFrm; }
+ const SwFlyFrm* GetFlyFrm() const { return m_pFlyFrm; }
void SetRect() const;
commit 6329a3036e7df33d962d0164b5689862ae4498b7
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Nov 16 10:26:36 2015 +0100
sw: prefix members of SwTextFrmBreak.
Change-Id: Id1d6166ee8c1c3558746da1d7bb5ad2163a87845
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 5ee3ce3..b995ee6 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -55,28 +55,28 @@ inline bool IsNastyFollow( const SwTextFrm *pFrm )
}
SwTextFrmBreak::SwTextFrmBreak( SwTextFrm *pNewFrm, const SwTwips nRst )
- : nRstHeight(nRst), pFrm(pNewFrm)
+ : m_nRstHeight(nRst), m_pFrm(pNewFrm)
{
- SwSwapIfSwapped swap(pFrm);
- SWRECTFN( pFrm )
- nOrigin = (pFrm->*fnRect->fnGetPrtTop)();
- bKeep = !pFrm->IsMoveable() || IsNastyFollow( pFrm );
- if( !bKeep && pFrm->IsInSct() )
+ SwSwapIfSwapped swap(m_pFrm);
+ SWRECTFN( m_pFrm )
+ m_nOrigin = (m_pFrm->*fnRect->fnGetPrtTop)();
+ m_bKeep = !m_pFrm->IsMoveable() || IsNastyFollow( m_pFrm );
+ if( !m_bKeep && m_pFrm->IsInSct() )
{
- const SwSectionFrm* const pSct = pFrm->FindSctFrm();
- bKeep = pSct->Lower()->IsColumnFrm() && !pSct->MoveAllowed( pFrm );
+ const SwSectionFrm* const pSct = m_pFrm->FindSctFrm();
+ m_bKeep = pSct->Lower()->IsColumnFrm() && !pSct->MoveAllowed( m_pFrm );
}
- bKeep = bKeep ||
!pFrm->GetTextNode()->GetSwAttrSet().GetSplit().GetValue() ||
- pFrm->GetTextNode()->GetSwAttrSet().GetKeep().GetValue();
- bBreak = false;
+ m_bKeep = m_bKeep ||
!m_pFrm->GetTextNode()->GetSwAttrSet().GetSplit().GetValue() ||
+ m_pFrm->GetTextNode()->GetSwAttrSet().GetKeep().GetValue();
+ m_bBreak = false;
- if( !nRstHeight && !pFrm->IsFollow() && pFrm->IsInFootnote() &&
pFrm->HasPara() )
+ if( !m_nRstHeight && !m_pFrm->IsFollow() && m_pFrm->IsInFootnote() &&
m_pFrm->HasPara() )
{
- nRstHeight = pFrm->GetFootnoteFrmHeight();
- nRstHeight += (pFrm->Prt().*fnRect->fnGetHeight)() -
- (pFrm->Frm().*fnRect->fnGetHeight)();
- if( nRstHeight < 0 )
- nRstHeight = 0;
+ m_nRstHeight = m_pFrm->GetFootnoteFrmHeight();
+ m_nRstHeight += (m_pFrm->Prt().*fnRect->fnGetHeight)() -
+ (m_pFrm->Frm().*fnRect->fnGetHeight)();
+ if( m_nRstHeight < 0 )
+ m_nRstHeight = 0;
}
}
@@ -104,28 +104,28 @@ bool SwTextFrmBreak::IsInside( SwTextMargin &rLine ) const
{
bool bFit = false;
- SwSwapIfSwapped swap(pFrm);
- SWRECTFN( pFrm )
+ SwSwapIfSwapped swap(m_pFrm);
+ SWRECTFN( m_pFrm )
// nOrigin is an absolut value, rLine referes to the swapped situation.
SwTwips nTmpY;
- if ( pFrm->IsVertical() )
- nTmpY = pFrm->SwitchHorizontalToVertical( rLine.Y() +
rLine.GetLineHeight() );
+ if ( m_pFrm->IsVertical() )
+ nTmpY = m_pFrm->SwitchHorizontalToVertical( rLine.Y() +
rLine.GetLineHeight() );
else
nTmpY = rLine.Y() + rLine.GetLineHeight();
- SwTwips nLineHeight = (*fnRect->fnYDiff)( nTmpY , nOrigin );
+ SwTwips nLineHeight = (*fnRect->fnYDiff)( nTmpY , m_nOrigin );
// 7455 und 6114: Calculate extra space for bottom border.
- nLineHeight += (pFrm->*fnRect->fnGetBottomMargin)();
+ nLineHeight += (m_pFrm->*fnRect->fnGetBottomMargin)();
- if( nRstHeight )
- bFit = nRstHeight >= nLineHeight;
+ if( m_nRstHeight )
+ bFit = m_nRstHeight >= nLineHeight;
else
{
// The Frm has a height to fit on the page.
SwTwips nHeight =
- (*fnRect->fnYDiff)( (pFrm->GetUpper()->*fnRect->fnGetPrtBottom)(),
nOrigin );
+ (*fnRect->fnYDiff)(
(m_pFrm->GetUpper()->*fnRect->fnGetPrtBottom)(), m_nOrigin );
// If everything is inside the existing frame the result is true;
bFit = nHeight >= nLineHeight;
@@ -133,11 +133,11 @@ bool SwTextFrmBreak::IsInside( SwTextMargin &rLine ) const
if ( !bFit )
{
if ( rLine.GetNext() &&
- pFrm->IsInTab() && !pFrm->GetFollow() && !pFrm->GetIndNext() )
+ m_pFrm->IsInTab() && !m_pFrm->GetFollow() &&
!m_pFrm->GetIndNext() )
{
// add additional space taken as lower space as last content
in a table
// for all text lines except the last one.
- nHeight += pFrm->CalcAddLowerSpaceAsLastInTableCell();
+ nHeight += m_pFrm->CalcAddLowerSpaceAsLastInTableCell();
bFit = nHeight >= nLineHeight;
}
}
@@ -147,7 +147,7 @@ bool SwTextFrmBreak::IsInside( SwTextMargin &rLine ) const
// The LineHeight exceeds the current Frm height.
// Call a test Grow to detect if the Frame could
// grow the requested area.
- nHeight += pFrm->GrowTst( LONG_MAX );
+ nHeight += m_pFrm->GrowTst( LONG_MAX );
// The Grow() returns the height by which the Upper of the TextFrm
// would let the TextFrm grow.
@@ -161,12 +161,12 @@ bool SwTextFrmBreak::IsInside( SwTextMargin &rLine ) const
bool SwTextFrmBreak::IsBreakNow( SwTextMargin &rLine )
{
- SwSwapIfSwapped swap(pFrm);
+ SwSwapIfSwapped swap(m_pFrm);
// bKeep is stronger than IsBreakNow()
// Is there enough space ?
- if( bKeep || IsInside( rLine ) )
- bBreak = false;
+ if( m_bKeep || IsInside( rLine ) )
+ m_bBreak = false;
else
{
/* This class assumes that the SwTextMargin is processed from Top to
@@ -179,87 +179,87 @@ bool SwTextFrmBreak::IsBreakNow( SwTextMargin &rLine )
// 6010: include DropLines
bool bFirstLine = 1 == rLine.GetLineNr() && !rLine.GetPrev();
- bBreak = true;
- if( ( bFirstLine && pFrm->GetIndPrev() )
+ m_bBreak = true;
+ if( ( bFirstLine && m_pFrm->GetIndPrev() )
|| ( rLine.GetLineNr() <= rLine.GetDropLines() ) )
{
- bKeep = true;
- bBreak = false;
+ m_bKeep = true;
+ m_bBreak = false;
}
- else if(bFirstLine && pFrm->IsInFootnote() &&
!pFrm->FindFootnoteFrm()->GetPrev())
+ else if(bFirstLine && m_pFrm->IsInFootnote() &&
!m_pFrm->FindFootnoteFrm()->GetPrev())
{
- SwLayoutFrm* pTmp = pFrm->FindFootnoteBossFrm()->FindBodyCont();
+ SwLayoutFrm* pTmp = m_pFrm->FindFootnoteBossFrm()->FindBodyCont();
if( !pTmp || !pTmp->Lower() )
- bBreak = false;
+ m_bBreak = false;
}
}
- return bBreak;
+ return m_bBreak;
}
/// OD 2004-02-27 #106629# - no longer inline
void SwTextFrmBreak::SetRstHeight( const SwTextMargin &rLine )
{
// OD, FME 2004-02-27 #106629# - consider bottom margin
- SWRECTFN( pFrm )
+ SWRECTFN( m_pFrm )
- nRstHeight = (pFrm->*fnRect->fnGetBottomMargin)();
+ m_nRstHeight = (m_pFrm->*fnRect->fnGetBottomMargin)();
if ( bVert )
{
- if ( pFrm->IsVertLR() )
- nRstHeight = (*fnRect->fnYDiff)(
pFrm->SwitchHorizontalToVertical( rLine.Y() ) , nOrigin );
+ if ( m_pFrm->IsVertLR() )
+ m_nRstHeight = (*fnRect->fnYDiff)(
m_pFrm->SwitchHorizontalToVertical( rLine.Y() ) , m_nOrigin );
else
- nRstHeight += nOrigin - pFrm->SwitchHorizontalToVertical(
rLine.Y() );
+ m_nRstHeight += m_nOrigin - m_pFrm->SwitchHorizontalToVertical(
rLine.Y() );
}
else
- nRstHeight += rLine.Y() - nOrigin;
+ m_nRstHeight += rLine.Y() - m_nOrigin;
}
WidowsAndOrphans::WidowsAndOrphans( SwTextFrm *pNewFrm, const SwTwips nRst,
bool bChkKeep )
: SwTextFrmBreak( pNewFrm, nRst ), nWidLines( 0 ), nOrphLines( 0 )
{
- SwSwapIfSwapped swap(pFrm);
+ SwSwapIfSwapped swap(m_pFrm);
- if( bKeep )
+ if( m_bKeep )
{
// 5652: If pararagraph should not be split but is larger than
// the page, then bKeep is overruled.
- if( bChkKeep && !pFrm->GetPrev() && !pFrm->IsInFootnote() &&
- pFrm->IsMoveable() &&
- ( !pFrm->IsInSct() || pFrm->FindSctFrm()->MoveAllowed(pFrm) ) )
- bKeep = false;
+ if( bChkKeep && !m_pFrm->GetPrev() && !m_pFrm->IsInFootnote() &&
+ m_pFrm->IsMoveable() &&
+ ( !m_pFrm->IsInSct() || m_pFrm->FindSctFrm()->MoveAllowed(m_pFrm)
) )
+ m_bKeep = false;
// Even if Keep is set, Orphans has to be respected.
// e.g. if there are chained frames where a Follow in the last frame
// receives a Keep, because it is not (forward) movable -
// nevertheless the paragraph can request lines from the Master
// because of the Orphan rule.
- if( pFrm->IsFollow() )
- nWidLines =
pFrm->GetTextNode()->GetSwAttrSet().GetWidows().GetValue();
+ if( m_pFrm->IsFollow() )
+ nWidLines =
m_pFrm->GetTextNode()->GetSwAttrSet().GetWidows().GetValue();
}
else
{
- const SwAttrSet& rSet = pFrm->GetTextNode()->GetSwAttrSet();
+ const SwAttrSet& rSet = m_pFrm->GetTextNode()->GetSwAttrSet();
const SvxOrphansItem &rOrph = rSet.GetOrphans();
if ( rOrph.GetValue() > 1 )
nOrphLines = rOrph.GetValue();
- if ( pFrm->IsFollow() )
+ if ( m_pFrm->IsFollow() )
nWidLines = rSet.GetWidows().GetValue();
}
- if ( bKeep || nWidLines || nOrphLines )
+ if ( m_bKeep || nWidLines || nOrphLines )
{
bool bResetFlags = false;
- if ( pFrm->IsInTab() )
+ if ( m_pFrm->IsInTab() )
{
// For compatibility reasons, we disable Keep/Widows/Orphans
// inside splittable row frames:
- if ( pFrm->GetNextCellLeaf( MAKEPAGE_NONE ) ||
pFrm->IsInFollowFlowRow() )
+ if ( m_pFrm->GetNextCellLeaf( MAKEPAGE_NONE ) ||
m_pFrm->IsInFollowFlowRow() )
{
- const SwFrm* pTmpFrm = pFrm->GetUpper();
+ const SwFrm* pTmpFrm = m_pFrm->GetUpper();
while ( !pTmpFrm->IsRowFrm() )
pTmpFrm = pTmpFrm->GetUpper();
if ( static_cast<const
SwRowFrm*>(pTmpFrm)->IsRowSplitAllowed() )
@@ -267,15 +267,15 @@ WidowsAndOrphans::WidowsAndOrphans( SwTextFrm *pNewFrm,
const SwTwips nRst,
}
}
- if( pFrm->IsInFootnote() && !pFrm->GetIndPrev() )
+ if( m_pFrm->IsInFootnote() && !m_pFrm->GetIndPrev() )
{
// Inside of footnotes there are good reasons to turn off the Keep
attribute
// as well as Widows/Orphans.
- SwFootnoteFrm *pFootnote = pFrm->FindFootnoteFrm();
+ SwFootnoteFrm *pFootnote = m_pFrm->FindFootnoteFrm();
const bool bFt = !pFootnote->GetAttr()->GetFootnote().IsEndNote();
if( !pFootnote->GetPrev() &&
pFootnote->FindFootnoteBossFrm( bFt ) !=
pFootnote->GetRef()->FindFootnoteBossFrm( bFt )
- && ( !pFrm->IsInSct() || pFrm->FindSctFrm()->MoveAllowed(pFrm)
) )
+ && ( !m_pFrm->IsInSct() ||
m_pFrm->FindSctFrm()->MoveAllowed(m_pFrm) ) )
{
bResetFlags = true;
}
@@ -283,7 +283,7 @@ WidowsAndOrphans::WidowsAndOrphans( SwTextFrm *pNewFrm,
const SwTwips nRst,
if ( bResetFlags )
{
- bKeep = false;
+ m_bKeep = false;
nOrphLines = 0;
nWidLines = 0;
}
@@ -300,9 +300,9 @@ bool WidowsAndOrphans::FindBreak( SwTextFrm *pFrame,
SwTextMargin &rLine,
{
// OD 2004-02-25 #i16128# - Why member <pFrm> _*and*_ parameter <pFrame>??
// Thus, assertion on situation, that these are different to figure out
why.
- OSL_ENSURE( pFrm == pFrame, "<WidowsAndOrphans::FindBreak> - pFrm !=
pFrame" );
+ OSL_ENSURE( m_pFrm == pFrame, "<WidowsAndOrphans::FindBreak> - pFrm !=
pFrame" );
- SwSwapIfSwapped swap(pFrm);
+ SwSwapIfSwapped swap(m_pFrm);
bool bRet = true;
sal_uInt16 nOldOrphans = nOrphLines;
@@ -499,14 +499,14 @@ bool WidowsAndOrphans::WouldFit( SwTextMargin &rLine,
SwTwips &rMaxHeight, bool
return false;
// Check the Widows-rule
- if( !nWidLines && !pFrm->IsFollow() )
+ if( !nWidLines && !m_pFrm->IsFollow() )
{
// Usually we only have to check for Widows if we are a Follow.
// On WouldFit the rule has to be checked for the Master too,
// because we are just in the middle of calculating the break.
// In Ctor of WidowsAndOrphans the nWidLines are only calced for
// Follows from the AttrSet - so we catch up now:
- const SwAttrSet& rSet = pFrm->GetTextNode()->GetSwAttrSet();
+ const SwAttrSet& rSet = m_pFrm->GetTextNode()->GetSwAttrSet();
nWidLines = rSet.GetWidows().GetValue();
}
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 8541848..207bfe3 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -26,18 +26,18 @@ class SwTextFrm;
class SwTextFrmBreak
{
private:
- SwTwips nRstHeight;
- SwTwips nOrigin;
+ SwTwips m_nRstHeight;
+ SwTwips m_nOrigin;
protected:
- SwTextFrm *pFrm;
- bool bBreak;
- bool bKeep;
+ SwTextFrm *m_pFrm;
+ bool m_bBreak;
+ bool m_bKeep;
public:
SwTextFrmBreak( SwTextFrm *pFrm, const SwTwips nRst = 0 );
bool IsBreakNow( SwTextMargin &rLine );
- bool IsKeepAlways() const { return bKeep; }
+ bool IsKeepAlways() const { return m_bKeep; }
- inline void SetKeep( const bool bNew ) { bKeep = bNew; }
+ inline void SetKeep( const bool bNew ) { m_bKeep = bNew; }
bool IsInside( SwTextMargin &rLine ) const;
commit edf26ccc29466d854ee1eb8a158f0c5002160000
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Nov 16 10:46:32 2015 +0100
sw: Prefix a member that may conflict after a rename.
Change-Id: I083dfbb768df0ba2a6bd6a396cf33ab1e2e09f4b
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 68a8b56..24c66d4 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1057,14 +1057,14 @@ struct SwFindParaAttr : public SwFindParas
bool bValue;
const SfxItemSet *pSet, *pReplSet;
const SearchOptions *pSearchOpt;
- SwCursor& rCursor;
+ SwCursor& m_rCursor;
utl::TextSearch* pSText;
SwFindParaAttr( const SfxItemSet& rSet, bool bNoCollection,
const SearchOptions* pOpt, const SfxItemSet* pRSet,
SwCursor& rCrsr )
: bValue( bNoCollection ), pSet( &rSet ), pReplSet( pRSet ),
- pSearchOpt( pOpt ), rCursor( rCrsr ),pSText( nullptr ) {}
+ pSearchOpt( pOpt ), m_rCursor( rCrsr ),pSText( nullptr ) {}
virtual ~SwFindParaAttr() { delete pSText; }
@@ -1150,15 +1150,15 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn
fnMove, const SwPaM* pRegion,
if( bRegExp )
{
pPrevRing = const_cast< SwPaM* >(pRegion)->GetPrev();
- const_cast< SwPaM* >(pRegion)->GetRingContainer().merge(
rCursor.GetRingContainer() );
+ const_cast< SwPaM* >(pRegion)->GetRingContainer().merge(
m_rCursor.GetRingContainer() );
}
std::unique_ptr<OUString> pRepl( (bRegExp) ?
ReplaceBackReferences( *pSearchOpt, pCrsr ) : nullptr );
- rCursor.GetDoc()->getIDocumentContentOperations().ReplaceRange( *pCrsr,
+ m_rCursor.GetDoc()->getIDocumentContentOperations().ReplaceRange(
*pCrsr,
(pRepl.get()) ? *pRepl : pSearchOpt->replaceString,
bRegExp );
- rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
+ m_rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
if( bRegExp )
{
commit 92798feb43fa4c14845c4bcc31330e406a5b5f07
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Nov 16 10:45:42 2015 +0100
sw: Kill unused member.
Change-Id: I2c4de63330a18c4354293d0220e5320eda7d67e4
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index d99e98c..dea3178 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -31,10 +31,8 @@
struct SwFindParaFormatColl : public SwFindParas
{
const SwTextFormatColl *pFormatColl, *pReplColl;
- SwCursor& rCursor;
- SwFindParaFormatColl( const SwTextFormatColl& rFormatColl,
- const SwTextFormatColl* pRpColl, SwCursor& rCrsr )
- : pFormatColl( &rFormatColl ), pReplColl( pRpColl ), rCursor( rCrsr )
+ SwFindParaFormatColl(const SwTextFormatColl& rFormatColl, const
SwTextFormatColl* pRpColl)
+ : pFormatColl( &rFormatColl ), pReplColl( pRpColl )
{}
virtual ~SwFindParaFormatColl() {}
virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly )
override;
@@ -86,7 +84,7 @@ sal_uLong SwCursor::Find( const SwTextFormatColl&
rFormatColl, SwDocPositions nS
&aRewriter );
}
- SwFindParaFormatColl aSwFindParaFormatColl( rFormatColl, pReplFormatColl,
*this );
+ SwFindParaFormatColl aSwFindParaFormatColl(rFormatColl, pReplFormatColl);
sal_uLong nRet = FindAll( aSwFindParaFormatColl, nStart, nEnd, eFndRngs,
bCancel );
pDoc->SetOle2Link( aLnk );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
