summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2016-11-25 17:25:08 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2016-11-25 13:11:04 +0000
commit3f20d981311d87a3c3ccc933f2e8c6e3e6d8ff39 (patch)
treeb9530ed13f33089e6252fa7ae508116a8bc8dce3
parentc6bc45880c73be300b1c2604546a67941cbbe7c6 (diff)
starmath: Prefix members of SmBinDiagonalNode etc.
Change-Id: Icd863b23cfca635f901a0aea65fa26dace0aa8f9 Reviewed-on: https://gerrit.libreoffice.org/31188 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
-rw-r--r--starmath/inc/node.hxx37
-rw-r--r--starmath/source/node.cxx9
2 files changed, 20 insertions, 26 deletions
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index ff842f58820f..0b91d220e16f 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -788,16 +788,20 @@ public:
*/
class SmBinDiagonalNode : public SmStructureNode
{
- bool bAscending;
+ bool mbAscending;
void GetOperPosSize(Point &rPos, Size &rSize,
const Point &rDiagPoint, double fAngleDeg) const;
public:
- explicit SmBinDiagonalNode(const SmToken &rNodeToken);
+ explicit SmBinDiagonalNode(const SmToken &rNodeToken)
+ : SmStructureNode(NBINDIAGONAL, rNodeToken, 3)
+ , mbAscending(false)
+ {
+ }
- bool IsAscending() const { return bAscending; }
- void SetAscending(bool bVal) { bAscending = bVal; }
+ bool IsAscending() const { return mbAscending; }
+ void SetAscending(bool bVal) { mbAscending = bVal; }
virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override;
void Accept(SmVisitor* pVisitor) override;
@@ -846,13 +850,13 @@ enum SmSubSup
*/
class SmSubSupNode : public SmStructureNode
{
- bool bUseLimits;
+ bool mbUseLimits;
public:
explicit SmSubSupNode(const SmToken &rNodeToken)
: SmStructureNode(NSUBSUP, rNodeToken, 1 + SUBSUP_NUM_ENTRIES)
+ , mbUseLimits(false)
{
- bUseLimits = false;
}
/** Get body (Not NULL) */
@@ -863,8 +867,8 @@ public:
return const_cast<SmSubSupNode *>(this)->GetBody();
}
- void SetUseLimits(bool bVal) { bUseLimits = bVal; }
- bool IsUseLimits() const { return bUseLimits; };
+ void SetUseLimits(bool bVal) { mbUseLimits = bVal; }
+ bool IsUseLimits() const { return mbUseLimits; };
/** Get super- or subscript
* @remarks this method may return NULL.
@@ -928,24 +932,21 @@ public:
*/
class SmBracebodyNode : public SmStructureNode
{
- long nBodyHeight;
+ long mnBodyHeight;
public:
- explicit inline SmBracebodyNode(const SmToken &rNodeToken);
+ explicit SmBracebodyNode(const SmToken &rNodeToken)
+ : SmStructureNode(NBRACEBODY, rNodeToken)
+ , mnBodyHeight(0)
+ {
+ }
virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override;
- long GetBodyHeight() const { return nBodyHeight; }
+ long GetBodyHeight() const { return mnBodyHeight; }
void Accept(SmVisitor* pVisitor) override;
};
-inline SmBracebodyNode::SmBracebodyNode(const SmToken &rNodeToken) :
- SmStructureNode(NBRACEBODY, rNodeToken)
-{
- nBodyHeight = 0;
-}
-
-
/** Node for vertical brace construction
*
* Used to implement commands "[body] underbrace [script]" and
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 47a6207e7667..39041333533f 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -956,13 +956,6 @@ sal_uInt16 GetLineIntersectionPoint(Point &rResult,
}
-SmBinDiagonalNode::SmBinDiagonalNode(const SmToken &rNodeToken)
- : SmStructureNode(NBINDIAGONAL, rNodeToken, 3)
-{
- bAscending = false;
-}
-
-
/// @return position and size of the diagonal line
/// premise: SmRect of the node defines the limitation(!) consequently it has to be known upfront
void SmBinDiagonalNode::GetOperPosSize(Point &rPos, Size &rSize,
@@ -1462,7 +1455,7 @@ void SmBracebodyNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
aRefRect.ExtendBy(aTmpRect, RectCopyMBL::Xor);
}
- nBodyHeight = aRefRect.GetHeight();
+ mnBodyHeight = aRefRect.GetHeight();
// scale separators to required height and arrange them
bool bScale = GetScaleMode() == SCALE_HEIGHT || rFormat.IsScaleNormalBrackets();