mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prefix SwFlyCntPortion member var names

Browse Source 
Change-Id: Ia46b4a4f869390f452f565cf9a8f5d94bcf79ca7
Reviewed-on: https://gerrit.libreoffice.org/32320
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Bjoern Michaelsen
2016-12-22 02:48:10 +01:00
committed by Björn Michaelsen
parent c31bc15510
commit 2c1a6138e4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sw/source/core/text/porfly.cxx
View File

@@ -254,8 +254,8 @@ void sw::DrawFlyCntPortion::Paint(const SwTextPaintInfo&) const
* Use the dimensions of pFly->OutRect() * Use the dimensions of pFly->OutRect()
*/ */
SwFlyCntPortion::SwFlyCntPortion() SwFlyCntPortion::SwFlyCntPortion()
: bMax(false) : m_bMax(false)
, eAlign(sw::LineAlign::NONE) , m_eAlign(sw::LineAlign::NONE)
{ {
nLineLength = 1; nLineLength = 1;
SetWhichPor(POR_FLYCNT); SetWhichPor(POR_FLYCNT);
@@ -381,7 +381,7 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame, const Point &rBase,
SetAlign( aObjPositioning.GetLineAlignment() ); SetAlign( aObjPositioning.GetLineAlignment() );
aRef = aObjPositioning.GetAnchorPos(); m_aRef = aObjPositioning.GetAnchorPos();
if( nFlags & AsCharFlags::Rotate ) if( nFlags & AsCharFlags::Rotate )
SvXSize( aObjPositioning.GetObjBoundRectInclSpacing().SSize() ); SvXSize( aObjPositioning.GetObjBoundRectInclSpacing().SSize() );
else else

16
sw/source/core/text/porfly.hxx
View File

@@ -45,19 +45,19 @@ public:
/// This portion represents an as-character anchored fly (shape, frame, etc.) /// This portion represents an as-character anchored fly (shape, frame, etc.)
class SwFlyCntPortion : public SwLinePortion class SwFlyCntPortion : public SwLinePortion
{ {
Point aRef; // Relatively to this point we calculate the AbsPos Point m_aRef; // Relatively to this point we calculate the AbsPos
bool bMax; // Line adjustment and height == line height bool m_bMax; // Line adjustment and height == line height
sw::LineAlign eAlign; sw::LineAlign m_eAlign;
virtual SdrObject* GetSdrObj(const SwTextFrame&) =0; virtual SdrObject* GetSdrObj(const SwTextFrame&) =0;
public: public:
SwFlyCntPortion(); SwFlyCntPortion();
inline const Point& GetRefPoint() const { return aRef; } inline const Point& GetRefPoint() const { return m_aRef; }
inline bool IsMax() const { return bMax; } inline bool IsMax() const { return m_bMax; }
inline sw::LineAlign GetAlign() const { return eAlign; } inline sw::LineAlign GetAlign() const { return m_eAlign; }
inline void SetAlign(sw::LineAlign eNew) { eAlign = eNew; } inline void SetAlign(sw::LineAlign eAlign) { m_eAlign = eAlign; }
inline void SetMax(bool bNew) { bMax = bNew; } inline void SetMax(bool bMax) { m_bMax = bMax; }
void SetBase(const SwTextFrame& rFrame, const Point& rBase, long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, AsCharFlags nFlags); void SetBase(const SwTextFrame& rFrame, const Point& rBase, long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, AsCharFlags nFlags);
virtual bool Format(SwTextFormatInfo& rInf) override; virtual bool Format(SwTextFormatInfo& rInf) override;
OUTPUT_OPERATOR_OVERRIDE OUTPUT_OPERATOR_OVERRIDE