Fix typos
Change-Id: I551ed9154c66f2b4d7622d19430352ad89c3d2f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209914 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
committed by
Julien Nabet
parent
82869b1d51
commit
1b41793844
+11
-11
@@ -1514,9 +1514,9 @@ std::unique_ptr<SmNode> SmParser5::DoSubSup(TG nActiveGroup, std::unique_ptr<SmN
|
|||||||
|
|
||||||
std::unique_ptr<SmSubSupNode> pNode(new SmSubSupNode(m_aCurToken));
|
std::unique_ptr<SmSubSupNode> pNode(new SmSubSupNode(m_aCurToken));
|
||||||
pNode->SetSelection(m_aCurESelection);
|
pNode->SetSelection(m_aCurESelection);
|
||||||
//! Of course 'm_aCurToken' is just the first sub-/supscript token.
|
//! Of course 'm_aCurToken' is just the first sub-/superscript token.
|
||||||
//! It should be of no further interest. The positions of the
|
//! It should be of no further interest. The positions of the
|
||||||
//! sub-/supscripts will be identified by the corresponding subnodes
|
//! sub-/superscripts will be identified by the corresponding subnodes
|
||||||
//! index in the 'aSubNodes' array (enum value from 'SmSubSup').
|
//! index in the 'aSubNodes' array (enum value from 'SmSubSup').
|
||||||
|
|
||||||
pNode->SetUseLimits(nActiveGroup == TG::Limit);
|
pNode->SetUseLimits(nActiveGroup == TG::Limit);
|
||||||
@@ -1525,7 +1525,7 @@ std::unique_ptr<SmNode> SmParser5::DoSubSup(TG nActiveGroup, std::unique_ptr<SmN
|
|||||||
std::vector<std::unique_ptr<SmNode>> aSubNodes(1 + SUBSUP_NUM_ENTRIES);
|
std::vector<std::unique_ptr<SmNode>> aSubNodes(1 + SUBSUP_NUM_ENTRIES);
|
||||||
aSubNodes[0] = std::move(xGivenNode);
|
aSubNodes[0] = std::move(xGivenNode);
|
||||||
|
|
||||||
// process all sub-/supscripts
|
// process all sub-/superscripts
|
||||||
int nIndex = 0;
|
int nIndex = 0;
|
||||||
while (TokenInGroup(nActiveGroup))
|
while (TokenInGroup(nActiveGroup))
|
||||||
{
|
{
|
||||||
@@ -1568,12 +1568,12 @@ std::unique_ptr<SmNode> SmParser5::DoSubSup(TG nActiveGroup, std::unique_ptr<SmN
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// skip sub-/supscript token
|
// skip sub-/superscript token
|
||||||
NextToken();
|
NextToken();
|
||||||
}
|
}
|
||||||
|
|
||||||
// get sub-/supscript node
|
// get sub-/superscript node
|
||||||
// (even when we saw a double-sub/supscript error in the above
|
// (even when we saw a double-sub/superscript error in the above
|
||||||
// in order to minimize mess and continue parsing.)
|
// in order to minimize mess and continue parsing.)
|
||||||
std::unique_ptr<SmNode> xSNode;
|
std::unique_ptr<SmNode> xSNode;
|
||||||
if (eType == TFROM || eType == TTO)
|
if (eType == TFROM || eType == TTO)
|
||||||
@@ -1603,7 +1603,7 @@ std::unique_ptr<SmNode> SmParser5::DoSubSupEvaluate(std::unique_ptr<SmNode> xGiv
|
|||||||
std::vector<std::unique_ptr<SmNode>> aSubNodes(1 + SUBSUP_NUM_ENTRIES);
|
std::vector<std::unique_ptr<SmNode>> aSubNodes(1 + SUBSUP_NUM_ENTRIES);
|
||||||
aSubNodes[0] = std::move(xGivenNode);
|
aSubNodes[0] = std::move(xGivenNode);
|
||||||
|
|
||||||
// process all sub-/supscripts
|
// process all sub-/superscripts
|
||||||
int nIndex = 0;
|
int nIndex = 0;
|
||||||
while (TokenInGroup(TG::Limit))
|
while (TokenInGroup(TG::Limit))
|
||||||
{
|
{
|
||||||
@@ -1631,9 +1631,9 @@ std::unique_ptr<SmNode> SmParser5::DoSubSupEvaluate(std::unique_ptr<SmNode> xGiv
|
|||||||
xENode = DoError(SmParseError::DoubleSubsupscript); // this also skips current token.
|
xENode = DoError(SmParseError::DoubleSubsupscript); // this also skips current token.
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
NextToken(); // skip sub-/supscript token
|
NextToken(); // skip sub-/superscript token
|
||||||
|
|
||||||
// get sub-/supscript node
|
// get sub-/superscript node
|
||||||
std::unique_ptr<SmNode> xSNode;
|
std::unique_ptr<SmNode> xSNode;
|
||||||
xSNode = DoTerm(true);
|
xSNode = DoTerm(true);
|
||||||
|
|
||||||
@@ -1653,7 +1653,7 @@ std::unique_ptr<SmNode> SmParser5::DoOpSubSup()
|
|||||||
xNode->SetSelection(m_aCurESelection);
|
xNode->SetSelection(m_aCurESelection);
|
||||||
// skip operator token
|
// skip operator token
|
||||||
NextToken();
|
NextToken();
|
||||||
// get sub- supscripts if any
|
// get sub- superscripts if any
|
||||||
if (m_aCurToken.nGroup == TG::Power)
|
if (m_aCurToken.nGroup == TG::Power)
|
||||||
return DoSubSup(TG::Power, std::move(xNode));
|
return DoSubSup(TG::Power, std::move(xNode));
|
||||||
return xNode;
|
return xNode;
|
||||||
@@ -1663,7 +1663,7 @@ std::unique_ptr<SmNode> SmParser5::DoPower()
|
|||||||
{
|
{
|
||||||
DepthProtect aDepthGuard(m_nParseDepth);
|
DepthProtect aDepthGuard(m_nParseDepth);
|
||||||
|
|
||||||
// get body for sub- supscripts on top of stack
|
// get body for sub- superscripts on top of stack
|
||||||
std::unique_ptr<SmNode> xNode(DoTerm(false));
|
std::unique_ptr<SmNode> xNode(DoTerm(false));
|
||||||
|
|
||||||
if (m_aCurToken.nGroup == TG::Power)
|
if (m_aCurToken.nGroup == TG::Power)
|
||||||
|
|||||||
@@ -522,7 +522,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
|
|||||||
bool bKeepVerAlignParams)
|
bool bKeepVerAlignParams)
|
||||||
// as 'ExtendBy' but keeps original values for AlignT, -M and -B and
|
// as 'ExtendBy' but keeps original values for AlignT, -M and -B and
|
||||||
// baseline.
|
// baseline.
|
||||||
// (this is used in 'SmSupSubNode' where the sub-/supscripts shouldn't
|
// (this is used in 'SmSupSubNode' where the sub-/superscripts shouldn't
|
||||||
// be allowed to modify these values.)
|
// be allowed to modify these values.)
|
||||||
{
|
{
|
||||||
tools::Long nOldAlignT = GetAlignT(),
|
tools::Long nOldAlignT = GetAlignT(),
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ namespace svgio::svgreader
|
|||||||
(bNoSWidth ? 1.0 : 1.0 / fSWidth) * rTarget.getWidth(),
|
(bNoSWidth ? 1.0 : 1.0 / fSWidth) * rTarget.getWidth(),
|
||||||
(bNoSHeight ? 1.0 : 1.0 / fSHeight) * rTarget.getHeight());
|
(bNoSHeight ? 1.0 : 1.0 / fSHeight) * rTarget.getHeight());
|
||||||
|
|
||||||
// transform from unit rage to target range
|
// transform from unit range to target range
|
||||||
aRetval.translate(rTarget.getMinX(), rTarget.getMinY());
|
aRetval.translate(rTarget.getMinX(), rTarget.getMinY());
|
||||||
|
|
||||||
return aRetval;
|
return aRetval;
|
||||||
@@ -901,7 +901,7 @@ namespace svgio::svgreader
|
|||||||
|
|
||||||
// caution: String is evaluated from left to right, but matrix multiplication
|
// caution: String is evaluated from left to right, but matrix multiplication
|
||||||
// in SVG is right to left, so put the new transformation before the current
|
// in SVG is right to left, so put the new transformation before the current
|
||||||
// one by multiplicating from the right side
|
// one by multiplying from the right side
|
||||||
aMatrix = aMatrix * aNew;
|
aMatrix = aMatrix * aNew;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,14 +66,14 @@ namespace sdr::contact {
|
|||||||
const SdrUnoObj& _rUnoObject
|
const SdrUnoObj& _rUnoObject
|
||||||
);
|
);
|
||||||
|
|
||||||
/// ensures that the control belonging to this instances has a given visibility
|
/// ensures that the control belonging to this instance has a given visibility
|
||||||
void ensureControlVisibility( bool _bVisible ) const;
|
void ensureControlVisibility( bool _bVisible ) const;
|
||||||
|
|
||||||
/** sets the design/alive mode of the control
|
/** sets the design/alive mode of the control
|
||||||
*/
|
*/
|
||||||
void setControlDesignMode( bool _bDesignMode ) const;
|
void setControlDesignMode( bool _bDesignMode ) const;
|
||||||
|
|
||||||
/** callback from impl class to react on changes of properties form the XControlModel
|
/** callback from impl class to react on changes of properties from the XControlModel
|
||||||
*/
|
*/
|
||||||
void propertyChange();
|
void propertyChange();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user