[Libreoffice-commits] core.git: sw/inc sw/source
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 3 09:58:38 UTC 2020
sw/inc/htmltbl.hxx | 112 ++++++++++++++++++-------------------
sw/source/core/doc/htmltbl.cxx | 16 ++---
sw/source/core/inc/flyfrms.hxx | 6 -
sw/source/core/inc/txtfly.hxx | 34 +++++------
sw/source/core/layout/flyincnt.cxx | 4 -
sw/source/core/text/txtfly.cxx | 84 +++++++++++++--------------
6 files changed, 128 insertions(+), 128 deletions(-)
New commits:
commit 1de27900d2e1743825f297609f62cb0de3f1a032
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Aug 3 09:01:55 2020 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Aug 3 11:58:02 2020 +0200
sw: SwFlyInContentFrame, SwHTMLTableLayoutCnts, SwHTMLTableLayoutColumn ...
... and SwTextFly
See tdf#94879 for motivation.
Change-Id: I833b563a03824ae14014cdd418dcfd3b832a9a94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99984
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index ffff0af7112c..622557ab81e2 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -37,47 +37,47 @@ class SwFrameFormat;
class SwHTMLTableLayoutCnts
{
- std::shared_ptr<SwHTMLTableLayoutCnts> xNext; ///< The next content.
+ std::shared_ptr<SwHTMLTableLayoutCnts> m_xNext; ///< The next content.
/// Only one of the following two pointers may be set!
- SwTableBox *pBox; ///< A Box.
- std::shared_ptr<SwHTMLTableLayout> xTable; ///< A "table within a table".
+ SwTableBox *m_pBox; ///< A Box.
+ std::shared_ptr<SwHTMLTableLayout> m_xTable; ///< A "table within a table".
/** During first run there are still no boxes. In this case
pStartNode is used instead of pBox. */
- const SwStartNode *pStartNode;
+ const SwStartNode *m_pStartNode;
/** The following counters indicate how often a pass has been
done for this content. Therefore they are compared against
a reference value. If 255 is reached the continue with 0.
This avoids reinitialization on every resize. */
- sal_uInt8 nPass1Done; ///< How many times has Pass 1 been called?
- sal_uInt8 nWidthSet; ///< How many times has the width been set?
+ sal_uInt8 m_nPass1Done; ///< How many times has Pass 1 been called?
+ sal_uInt8 m_nWidthSet; ///< How many times has the width been set?
- bool bNoBreakTag; ///< <NOBR>-Tag over complete content.
+ bool m_bNoBreakTag; ///< <NOBR>-Tag over complete content.
public:
SwHTMLTableLayoutCnts(const SwStartNode* pSttNd, std::shared_ptr<SwHTMLTableLayout> const& rTab,
bool bNoBreakTag, std::shared_ptr<SwHTMLTableLayoutCnts> const& rNxt);
- void SetTableBox( SwTableBox *pBx ) { pBox = pBx; }
- SwTableBox *GetTableBox() const { return pBox; }
+ void SetTableBox( SwTableBox *pBx ) { m_pBox = pBx; }
+ SwTableBox *GetTableBox() const { return m_pBox; }
- SwHTMLTableLayout *GetTable() const { return xTable.get(); }
+ SwHTMLTableLayout *GetTable() const { return m_xTable.get(); }
const SwStartNode *GetStartNode() const;
/// Calculation of next node.
- const std::shared_ptr<SwHTMLTableLayoutCnts>& GetNext() const { return xNext; }
+ const std::shared_ptr<SwHTMLTableLayoutCnts>& GetNext() const { return m_xNext; }
- void SetWidthSet( sal_uInt8 nRef ) { nWidthSet = nRef; }
- bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==nWidthSet; }
+ void SetWidthSet( sal_uInt8 nRef ) { m_nWidthSet = nRef; }
+ bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==m_nWidthSet; }
- void SetPass1Done( sal_uInt8 nRef ) { nPass1Done = nRef; }
- bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; }
+ void SetPass1Done( sal_uInt8 nRef ) { m_nPass1Done = nRef; }
+ bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==m_nPass1Done; }
- bool HasNoBreakTag() const { return bNoBreakTag; }
+ bool HasNoBreakTag() const { return m_bNoBreakTag; }
};
class SwHTMLTableLayoutCell
@@ -119,19 +119,19 @@ class SwHTMLTableLayoutColumn
{
/// Interim values of AutoLayoutPass1,
- sal_uLong nMinNoAlign, nMaxNoAlign, nAbsMinNoAlign;
+ sal_uLong m_nMinNoAlign, m_nMaxNoAlign, m_nAbsMinNoAlign;
/// Results of AutoLayoutPass1
- sal_uLong nMin, nMax;
+ sal_uLong m_nMin, m_nMax;
/// Results of Pass 2.
- sal_uInt16 nAbsColWidth; ///< In Twips.
- sal_uInt16 nRelColWidth; ///< In Twips or relative to USHRT_MAX.
+ sal_uInt16 m_nAbsColWidth; ///< In Twips.
+ sal_uInt16 m_nRelColWidth; ///< In Twips or relative to USHRT_MAX.
- sal_uInt16 nWidthOption; ///< Options of <COL> or <TD>/<TH>.
+ sal_uInt16 m_nWidthOption; ///< Options of <COL> or <TD>/<TH>.
- bool bRelWidthOption : 1;
- bool bLeftBorder : 1;
+ bool m_bRelWidthOption : 1;
+ bool m_bLeftBorder : 1;
public:
@@ -141,29 +141,29 @@ public:
inline void MergeCellWidthOption( sal_uInt16 nWidth, bool bPercent );
inline void SetWidthOption( sal_uInt16 nWidth );
- sal_uInt16 GetWidthOption() const { return nWidthOption; }
- bool IsRelWidthOption() const { return bRelWidthOption; }
+ sal_uInt16 GetWidthOption() const { return m_nWidthOption; }
+ bool IsRelWidthOption() const { return m_bRelWidthOption; }
inline void MergeMinMaxNoAlign( sal_uLong nMin, sal_uLong nMax, sal_uLong nAbsMin );
- sal_uLong GetMinNoAlign() const { return nMinNoAlign; }
- sal_uLong GetMaxNoAlign() const { return nMaxNoAlign; }
- sal_uLong GetAbsMinNoAlign() const { return nAbsMinNoAlign; }
+ sal_uLong GetMinNoAlign() const { return m_nMinNoAlign; }
+ sal_uLong GetMaxNoAlign() const { return m_nMaxNoAlign; }
+ sal_uLong GetAbsMinNoAlign() const { return m_nAbsMinNoAlign; }
inline void ClearPass1Info( bool bWidthOpt );
inline void SetMinMax( sal_uLong nMin, sal_uLong nMax );
- void SetMax( sal_uLong nVal ) { nMax = nVal; }
- void AddToMin( sal_uLong nVal ) { nMin += nVal; }
- void AddToMax( sal_uLong nVal ) { nMax += nVal; }
- sal_uLong GetMin() const { return nMin; }
- sal_uLong GetMax() const { return nMax; }
+ void SetMax( sal_uLong nVal ) { m_nMax = nVal; }
+ void AddToMin( sal_uLong nVal ) { m_nMin += nVal; }
+ void AddToMax( sal_uLong nVal ) { m_nMax += nVal; }
+ sal_uLong GetMin() const { return m_nMin; }
+ sal_uLong GetMax() const { return m_nMax; }
- void SetAbsColWidth( sal_uInt16 nWidth ) { nAbsColWidth = nWidth; }
- sal_uInt16 GetAbsColWidth() const { return nAbsColWidth; }
+ void SetAbsColWidth( sal_uInt16 nWidth ) { m_nAbsColWidth = nWidth; }
+ sal_uInt16 GetAbsColWidth() const { return m_nAbsColWidth; }
- void SetRelColWidth( sal_uInt16 nWidth ) { nRelColWidth = nWidth; }
- sal_uInt16 GetRelColWidth() const { return nRelColWidth; }
+ void SetRelColWidth( sal_uInt16 nWidth ) { m_nRelColWidth = nWidth; }
+ sal_uInt16 GetRelColWidth() const { return m_nRelColWidth; }
- bool HasLeftBorder() const { return bLeftBorder; }
+ bool HasLeftBorder() const { return m_bLeftBorder; }
};
class SwHTMLTableLayout
@@ -348,40 +348,40 @@ inline void SwHTMLTableLayoutCell::SetProtected()
inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( sal_uLong nCMin,
sal_uLong nCMax, sal_uLong nAbsMin )
{
- if( nCMin > nMinNoAlign )
- nMinNoAlign = nCMin;
- if( nCMax > nMaxNoAlign )
- nMaxNoAlign = nCMax;
- if( nAbsMin > nAbsMinNoAlign )
- nAbsMinNoAlign = nAbsMin;
+ if( nCMin > m_nMinNoAlign )
+ m_nMinNoAlign = nCMin;
+ if( nCMax > m_nMaxNoAlign )
+ m_nMaxNoAlign = nCMax;
+ if( nAbsMin > m_nAbsMinNoAlign )
+ m_nAbsMinNoAlign = nAbsMin;
}
inline void SwHTMLTableLayoutColumn::ClearPass1Info( bool bWidthOpt )
{
- nMinNoAlign = nMaxNoAlign = nAbsMinNoAlign = MINLAY;
- nMin = nMax = 0;
+ m_nMinNoAlign = m_nMaxNoAlign = m_nAbsMinNoAlign = MINLAY;
+ m_nMin = m_nMax = 0;
if( bWidthOpt )
{
- nWidthOption = 0;
- bRelWidthOption = false;
+ m_nWidthOption = 0;
+ m_bRelWidthOption = false;
}
}
inline void SwHTMLTableLayoutColumn::MergeCellWidthOption(
sal_uInt16 nWidth, bool bRel )
{
- if( !nWidthOption ||
- (bRel==bRelWidthOption && nWidthOption < nWidth) )
+ if( !m_nWidthOption ||
+ (bRel==m_bRelWidthOption && m_nWidthOption < nWidth) )
{
- nWidthOption = nWidth;
- bRelWidthOption = bRel;
+ m_nWidthOption = nWidth;
+ m_bRelWidthOption = bRel;
}
}
inline void SwHTMLTableLayoutColumn::SetMinMax( sal_uLong nMn, sal_uLong nMx )
{
- nMin = nMn;
- nMax = nMx;
+ m_nMin = nMn;
+ m_nMax = nMx;
}
inline sal_uInt16 SwHTMLTableLayout::GetInhCellSpace( sal_uInt16 nCol,
@@ -403,8 +403,8 @@ inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol )
inline void SwHTMLTableLayoutColumn::SetWidthOption( sal_uInt16 nWidth )
{
- nWidthOption = nWidth;
- bRelWidthOption = true;
+ m_nWidthOption = nWidth;
+ m_bRelWidthOption = true;
}
inline void SwHTMLTableLayout::SetColumn( std::unique_ptr<SwHTMLTableLayoutColumn> pCol, sal_uInt16 nCol )
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index ff989ceca612..437ec985e9be 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -80,13 +80,13 @@ SwHTMLTableLayoutCnts::SwHTMLTableLayoutCnts(const SwStartNode *pSttNd,
std::shared_ptr<SwHTMLTableLayout> const& rTab,
bool bNoBrTag,
std::shared_ptr<SwHTMLTableLayoutCnts> const& rNxt ) :
- xNext( rNxt ), pBox( nullptr ), xTable( rTab ), pStartNode( pSttNd ),
- nPass1Done( 0 ), nWidthSet( 0 ), bNoBreakTag( bNoBrTag )
+ m_xNext( rNxt ), m_pBox( nullptr ), m_xTable( rTab ), m_pStartNode( pSttNd ),
+ m_nPass1Done( 0 ), m_nWidthSet( 0 ), m_bNoBreakTag( bNoBrTag )
{}
const SwStartNode *SwHTMLTableLayoutCnts::GetStartNode() const
{
- return pBox ? pBox->GetSttNd() : pStartNode;
+ return m_pBox ? m_pBox->GetSttNd() : m_pStartNode;
}
SwHTMLTableLayoutCell::SwHTMLTableLayoutCell(std::shared_ptr<SwHTMLTableLayoutCnts> const& rCnts,
@@ -102,11 +102,11 @@ SwHTMLTableLayoutCell::SwHTMLTableLayoutCell(std::shared_ptr<SwHTMLTableLayoutCn
SwHTMLTableLayoutColumn::SwHTMLTableLayoutColumn( sal_uInt16 nWidth,
bool bRelWidth,
bool bLBorder ) :
- nMinNoAlign(MINLAY), nMaxNoAlign(MINLAY), nAbsMinNoAlign(MINLAY),
- nMin(0), nMax(0),
- nAbsColWidth(0), nRelColWidth(0),
- nWidthOption( nWidth ), bRelWidthOption( bRelWidth ),
- bLeftBorder( bLBorder )
+ m_nMinNoAlign(MINLAY), m_nMaxNoAlign(MINLAY), m_nAbsMinNoAlign(MINLAY),
+ m_nMin(0), m_nMax(0),
+ m_nAbsColWidth(0), m_nRelColWidth(0),
+ m_nWidthOption( nWidth ), m_bRelWidthOption( bRelWidth ),
+ m_bLeftBorder( bLBorder )
{}
SwHTMLTableLayoutConstraints::SwHTMLTableLayoutConstraints(sal_uLong nMin, sal_uLong nMax,
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 4c6940c28edc..5a6e4643bda2 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -195,7 +195,7 @@ public:
// Flys that are bound to a character in Content
class SwFlyInContentFrame : public SwFlyFrame
{
- Point aRef; // relative to this point AbsPos is being calculated
+ Point m_aRef; // relative to this point AbsPos is being calculated
virtual void DestroyImpl() override;
virtual ~SwFlyInContentFrame() override;
@@ -215,7 +215,7 @@ public:
void SetRefPoint( const Point& rPoint, const Point &rRelAttr,
const Point &rRelPos );
- const Point &GetRefPoint() const { return aRef; }
+ const Point &GetRefPoint() const { return m_aRef; }
Point const & GetRelPos() const;
// (26.11.93, see tabfrm.hxx, but might also be valid for others)
@@ -226,7 +226,7 @@ public:
void RegistFlys();
//see layact.cxx
- void AddRefOfst( long nOfst ) { aRef.AdjustY( nOfst ); }
+ void AddRefOfst( long nOfst ) { m_aRef.AdjustY( nOfst ); }
// #i26791#
virtual void MakeObjPos() override;
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 611e64e7c573..c8c645e543e1 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -118,18 +118,18 @@ public:
*/
class SwTextFly
{
- const SwPageFrame * pPage;
+ const SwPageFrame * m_pPage;
const SwAnchoredObject * mpCurrAnchoredObj;
const SwTextFrame * m_pCurrFrame;
const SwTextFrame * m_pMaster;
std::unique_ptr<SwAnchoredObjList> mpAnchoredObjList;
- long nMinBottom;
- long nNextTop; /// Stores the upper edge of the "next" frame
+ long m_nMinBottom;
+ long m_nNextTop; /// Stores the upper edge of the "next" frame
sal_uLong m_nCurrFrameNodeIndex;
- bool bOn : 1;
- bool bTopRule: 1;
+ bool m_bOn : 1;
+ bool m_bTopRule: 1;
bool mbIgnoreCurrentFrame: 1;
bool mbIgnoreContour: 1;
@@ -307,35 +307,35 @@ inline SwAnchoredObjList* SwTextFly::GetAnchoredObjList() const
inline void SwTextFly::SetTopRule()
{
- bTopRule = false;
+ m_bTopRule = false;
}
inline bool SwTextFly::IsOn() const
{
- return bOn;
+ return m_bOn;
}
inline bool SwTextFly::Relax( const SwRect &rRect )
{
- if (bOn)
+ if (m_bOn)
{
- bOn = IsAnyFrame( rRect );
+ m_bOn = IsAnyFrame( rRect );
}
- return bOn;
+ return m_bOn;
}
inline bool SwTextFly::Relax()
{
- if (bOn)
+ if (m_bOn)
{
- bOn = IsAnyFrame();
+ m_bOn = IsAnyFrame();
}
- return bOn;
+ return m_bOn;
}
inline SwTwips SwTextFly::GetMinBottom() const
{
- return mpAnchoredObjList ? nMinBottom : CalcMinBottom();
+ return mpAnchoredObjList ? m_nMinBottom : CalcMinBottom();
}
inline const SwTextFrame* SwTextFly::GetMaster() const
@@ -345,17 +345,17 @@ inline const SwTextFrame* SwTextFly::GetMaster() const
inline long SwTextFly::GetNextTop() const
{
- return nNextTop;
+ return m_nNextTop;
}
inline void SwTextFly::SetNextTop( long nNew ) const
{
- const_cast<SwTextFly*>(this)->nNextTop = nNew;
+ const_cast<SwTextFly*>(this)->m_nNextTop = nNew;
}
inline SwRect SwTextFly::GetFrame( const SwRect &rRect ) const
{
- return bOn ? GetFrame_( rRect ) : SwRect();
+ return m_bOn ? GetFrame_( rRect ) : SwRect();
}
inline void SwTextFly::SetIgnoreCurrentFrame( bool bNew )
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index fed15e27e672..daeaaf314f17 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -63,13 +63,13 @@ void SwFlyInContentFrame::SetRefPoint( const Point& rPoint,
const Point& rRelPos )
{
// OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject>
- OSL_ENSURE( rPoint != aRef || rRelAttr != GetCurrRelPos(), "SetRefPoint: no change" );
+ OSL_ENSURE( rPoint != m_aRef || rRelAttr != GetCurrRelPos(), "SetRefPoint: no change" );
std::unique_ptr<SwFlyNotify, o3tl::default_delete<SwFlyNotify>> xNotify;
// No notify at a locked fly frame, if a fly frame is locked, there's
// already a SwFlyNotify object on the stack (MakeAll).
if( !IsLocked() )
xNotify.reset(new SwFlyNotify( this ));
- aRef = rPoint;
+ m_aRef = rPoint;
SetCurrRelPos( rRelAttr );
SwRectFnSet aRectFnSet(GetAnchorFrame());
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index a020d2435705..bb85fb4e085c 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -304,15 +304,15 @@ SwRect SwContourCache::ContourRect( const SwFormat* pFormat,
}
SwTextFly::SwTextFly()
- : pPage(nullptr)
+ : m_pPage(nullptr)
, mpCurrAnchoredObj(nullptr)
, m_pCurrFrame(nullptr)
, m_pMaster(nullptr)
- , nMinBottom(0)
- , nNextTop(0)
+ , m_nMinBottom(0)
+ , m_nNextTop(0)
, m_nCurrFrameNodeIndex(0)
- , bOn(false)
- , bTopRule(false)
+ , m_bOn(false)
+ , m_bTopRule(false)
, mbIgnoreCurrentFrame(false)
, mbIgnoreContour(false)
, mbIgnoreObjsInHeaderFooter(false)
@@ -327,7 +327,7 @@ SwTextFly::SwTextFly( const SwTextFrame *pFrame )
SwTextFly::SwTextFly( const SwTextFly& rTextFly )
{
- pPage = rTextFly.pPage;
+ m_pPage = rTextFly.m_pPage;
mpCurrAnchoredObj = rTextFly.mpCurrAnchoredObj;
m_pCurrFrame = rTextFly.m_pCurrFrame;
m_pMaster = rTextFly.m_pMaster;
@@ -336,10 +336,10 @@ SwTextFly::SwTextFly( const SwTextFly& rTextFly )
mpAnchoredObjList.reset( new SwAnchoredObjList( *(rTextFly.mpAnchoredObjList) ) );
}
- bOn = rTextFly.bOn;
- bTopRule = rTextFly.bTopRule;
- nMinBottom = rTextFly.nMinBottom;
- nNextTop = rTextFly.nNextTop;
+ m_bOn = rTextFly.m_bOn;
+ m_bTopRule = rTextFly.m_bTopRule;
+ m_nMinBottom = rTextFly.m_nMinBottom;
+ m_nNextTop = rTextFly.m_nNextTop;
m_nCurrFrameNodeIndex = rTextFly.m_nCurrFrameNodeIndex;
mbIgnoreCurrentFrame = rTextFly.mbIgnoreCurrentFrame;
mbIgnoreContour = rTextFly.mbIgnoreContour;
@@ -355,7 +355,7 @@ void SwTextFly::CtorInitTextFly( const SwTextFrame *pFrame )
mbIgnoreCurrentFrame = false;
mbIgnoreContour = false;
mbIgnoreObjsInHeaderFooter = false;
- pPage = pFrame->FindPageFrame();
+ m_pPage = pFrame->FindPageFrame();
const SwFlyFrame* pTmp = pFrame->FindFlyFrame();
// #i68520#
mpCurrAnchoredObj = pTmp;
@@ -366,10 +366,10 @@ void SwTextFly::CtorInitTextFly( const SwTextFrame *pFrame )
// It could be, however, that a line is added while formatting, that
// extends into a frame.
// That's why we do not optimize for: bOn = pSortedFlys && IsAnyFrame();
- bOn = pPage->GetSortedObjs() != nullptr;
- bTopRule = true;
- nMinBottom = 0;
- nNextTop = 0;
+ m_bOn = m_pPage->GetSortedObjs() != nullptr;
+ m_bTopRule = true;
+ m_nMinBottom = 0;
+ m_nNextTop = 0;
m_nCurrFrameNodeIndex = ULONG_MAX;
}
@@ -395,7 +395,7 @@ bool SwTextFly::IsAnyFrame() const
{
SwSwapIfSwapped swap(const_cast<SwTextFrame *>(m_pCurrFrame));
- OSL_ENSURE( bOn, "IsAnyFrame: Why?" );
+ OSL_ENSURE( m_bOn, "IsAnyFrame: Why?" );
SwRect aRect(m_pCurrFrame->getFrameArea().Pos() + m_pCurrFrame->getFramePrintArea().Pos(),
m_pCurrFrame->getFramePrintArea().SSize());
@@ -404,7 +404,7 @@ bool SwTextFly::IsAnyFrame() const
bool SwTextFly::IsAnyObj( const SwRect &rRect ) const
{
- OSL_ENSURE( bOn, "SwTextFly::IsAnyObj: Who's knocking?" );
+ OSL_ENSURE( m_bOn, "SwTextFly::IsAnyObj: Who's knocking?" );
SwRect aRect( rRect );
if ( aRect.IsEmpty() )
@@ -413,7 +413,7 @@ bool SwTextFly::IsAnyObj( const SwRect &rRect ) const
m_pCurrFrame->getFramePrintArea().SSize());
}
- const SwSortedObjs *pSorted = pPage->GetSortedObjs();
+ const SwSortedObjs *pSorted = m_pPage->GetSortedObjs();
if( pSorted ) // bOn actually makes sure that we have objects on the side,
// but who knows who deleted something in the meantime?
{
@@ -481,13 +481,13 @@ void SwTextFly::DrawTextOpaque( SwDrawTextInfo &rInf )
const sal_uInt32 nCurrOrd = mpCurrAnchoredObj
? mpCurrAnchoredObj->GetDrawObj()->GetOrdNum()
: SAL_MAX_UINT32;
- OSL_ENSURE( !bTopRule, "DrawTextOpaque: Wrong TopRule" );
+ OSL_ENSURE( !m_bTopRule, "DrawTextOpaque: Wrong TopRule" );
// #i68520#
- const SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 );
+ const SwAnchoredObjList::size_type nCount( m_bOn ? GetAnchoredObjList()->size() : 0 );
if (nCount > 0)
{
- const SdrLayerID nHellId = pPage->getRootFrame()->GetCurrShell()->getIDocumentDrawModelAccess().GetHellId();
+ const SdrLayerID nHellId = m_pPage->getRootFrame()->GetCurrShell()->getIDocumentDrawModelAccess().GetHellId();
for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i )
{
// #i68520#
@@ -568,12 +568,12 @@ void SwTextFly::DrawTextOpaque( SwDrawTextInfo &rInf )
void SwTextFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect )
{
SwRegionRects aRegion( rRect );
- OSL_ENSURE( !bTopRule, "DrawFlyRect: Wrong TopRule" );
+ OSL_ENSURE( !m_bTopRule, "DrawFlyRect: Wrong TopRule" );
// #i68520#
- const SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 );
+ const SwAnchoredObjList::size_type nCount( m_bOn ? GetAnchoredObjList()->size() : 0 );
if (nCount > 0)
{
- const SdrLayerID nHellId = pPage->getRootFrame()->GetCurrShell()->getIDocumentDrawModelAccess().GetHellId();
+ const SdrLayerID nHellId = m_pPage->getRootFrame()->GetCurrShell()->getIDocumentDrawModelAccess().GetHellId();
for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i )
{
// #i68520#
@@ -607,7 +607,7 @@ void SwTextFly::DrawFlyRect( OutputDevice* pOut, const SwRect &rRect )
// #i68520#
SwRect aFly( pAnchoredObjTmp->GetObjRect() );
// OD 24.01.2003 #106593#
- ::SwAlignRect( aFly, pPage->getRootFrame()->GetCurrShell(), pOut );
+ ::SwAlignRect( aFly, m_pPage->getRootFrame()->GetCurrShell(), pOut );
if( !aFly.IsEmpty() )
aRegion -= aFly;
}
@@ -644,7 +644,7 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
}
}
- if( ( bInFootnote || bInFooterOrHeader ) && bTopRule )
+ if( ( bInFootnote || bInFooterOrHeader ) && m_bTopRule )
{
// #i26945#
const SwFrameFormat& rFrameFormat = _pAnchoredObj->GetFrameFormat();
@@ -679,7 +679,7 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
// If bTopRule is not set, we ignore the frame types.
// We directly check the z-order
- if ( !bTopRule )
+ if ( !m_bTopRule )
bEvade = true;
else
{
@@ -830,7 +830,7 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
SwSwapIfSwapped swap(const_cast<SwTextFrame *>(m_pCurrFrame));
- const SwSortedObjs *pSorted = pPage->GetSortedObjs();
+ const SwSortedObjs *pSorted = m_pPage->GetSortedObjs();
const size_t nCount = pSorted ? pSorted->size() : 0;
// --> #108724# Page header/footer content doesn't have to wrap around
// floating screen objects
@@ -843,7 +843,7 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
(pIDSA->get(DocumentSettingId::ALLOW_WRAP_WHEN_ANCHORED_IN_TABLE) && m_pCurrFrame->IsInTab()) ||
(!m_pCurrFrame->IsInFootnote() && !bFooterHeader));
- bOn = false;
+ m_bOn = false;
if( nCount && bWrapAllowed )
{
@@ -898,7 +898,7 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
aRectFnSet.GetBottom(aBound) ) > 0 ||
nLeft > aRectFnSet.GetRight(aBound) ||
aRectFnSet.GetHeight(aBound) >
- 2 * aRectFnSet.GetHeight(pPage->getFrameArea()) )
+ 2 * aRectFnSet.GetHeight(m_pPage->getFrameArea()) )
{
continue;
}
@@ -932,19 +932,19 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
const SwFormatVertOrient &rTmpFormat =
pAnchoredObj->GetFrameFormat().GetVertOrient();
if( text::VertOrientation::BOTTOM != rTmpFormat.GetVertOrient() )
- nMinBottom = ( aRectFnSet.IsVert() && nMinBottom ) ?
- std::min( nMinBottom, aBound.Left() ) :
- std::max( nMinBottom, aRectFnSet.GetBottom(aBound) );
+ m_nMinBottom = ( aRectFnSet.IsVert() && m_nMinBottom ) ?
+ std::min( m_nMinBottom, aBound.Left() ) :
+ std::max( m_nMinBottom, aRectFnSet.GetBottom(aBound) );
}
- bOn = true;
+ m_bOn = true;
}
}
- if( nMinBottom )
+ if( m_nMinBottom )
{
SwTwips nMax = aRectFnSet.GetPrtBottom(*m_pCurrFrame->GetUpper());
- if( aRectFnSet.YDiff( nMinBottom, nMax ) > 0 )
- nMinBottom = nMax;
+ if( aRectFnSet.YDiff( m_nMinBottom, nMax ) > 0 )
+ m_nMinBottom = nMax;
}
}
else
@@ -999,10 +999,10 @@ bool SwTextFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const
SwRectFnSet aRectFnSet(m_pCurrFrame);
// tdf#127235 stop if the area is larger than the page
- if( aRectFnSet.GetHeight(pPage->getFrameArea()) < aRectFnSet.GetHeight(rRect))
+ if( aRectFnSet.GetHeight(m_pPage->getFrameArea()) < aRectFnSet.GetHeight(rRect))
{
// get the doc model description
- const SwPageDesc* pPageDesc = pPage->GetPageDesc();
+ const SwPageDesc* pPageDesc = m_pPage->GetPageDesc();
// if there is no next page style or it is the same as the current
// => stop trying to place the frame (it would end in an infinite loop)
@@ -1015,7 +1015,7 @@ bool SwTextFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const
bool bRet = false;
// #i68520#
- const SwAnchoredObjList::size_type nCount( bOn ? GetAnchoredObjList()->size() : 0 );
+ const SwAnchoredObjList::size_type nCount( m_bOn ? GetAnchoredObjList()->size() : 0 );
if (nCount > 0)
{
for( SwAnchoredObjList::size_type i = 0; i < nCount; ++i )
@@ -1161,7 +1161,7 @@ void SwTextFly::CalcRightMargin( SwRect &rFly,
const long nTmpTop = aRectFnSet.GetTop(aTmp);
if( aRectFnSet.YDiff( nTmpTop, aRectFnSet.GetTop(aLine) ) > 0 )
{
- if( aRectFnSet.YDiff( nNextTop, nTmpTop ) > 0 )
+ if( aRectFnSet.YDiff( m_nNextTop, nTmpTop ) > 0 )
SetNextTop( nTmpTop ); // upper border of next frame
}
else if (!aRectFnSet.GetWidth(aTmp)) // typical for Objects with contour wrap
@@ -1402,7 +1402,7 @@ bool SwTextFly::IsAnyFrame( const SwRect &rLine ) const
SwSwapIfSwapped swap(const_cast<SwTextFrame *>(m_pCurrFrame));
- OSL_ENSURE( bOn, "IsAnyFrame: Why?" );
+ OSL_ENSURE( m_bOn, "IsAnyFrame: Why?" );
return ForEach( rLine, nullptr, false );
}
More information about the Libreoffice-commits
mailing list