Skip to content

C
core
Kaydet (Commit) 71c2a1d3 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

ofz: reset sPush and sMainTerm once 'popped' 

Change-Id: Ib63dd132cb2055b76492f5d53e45c2a86dd8a131
Reviewed-on: https://gerrit.libreoffice.org/45940Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 1a658831
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 34 deletions
starmath/source/mathtype.cxx
Dosyayı görüntüle @ 71c2a1d3
......@@ -1350,9 +1350,9 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
}
else if (nPart == 1)
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
}
}
else
......@@ -1463,10 +1463,9 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
}
else if (nPart == 1)
{
sPush += rRet;
rRet = sPush;
rRet += " over ";
rRet += sMainTerm;
rRet = sPush + rRet + " over " + sMainTerm;
sPush.clear();
sMainTerm.clear();
}
}
if (nPart == 0)
......@@ -1512,18 +1511,18 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
}
else if ((nPart == 1) && (nVariation == 0))
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
else if ((nPart == 1) && (nVariation == 1))
newline--;
else if ((nPart == 2) && (nVariation == 1))
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
nPart++;
......@@ -1542,18 +1541,18 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
else if ((nPart == 1) &&
((nVariation == 1) || (nVariation==4)))
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
else if ((nPart == 1) && (nVariation == 2))
newline--;
else if ((nPart == 2) && (nVariation == 2))
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
nPart++;
......@@ -1573,9 +1572,9 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
else if ((nPart == 1) &&
((nVariation == 1) || (nVariation==3)))
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
nPart++;
......@@ -1591,18 +1590,18 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
else if ((nPart == 1) &&
((nVariation == 1) || (nVariation==2)))
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
else if ((nPart == 1) && (nVariation == 0))
newline--;
else if ((nPart == 2) && (nVariation == 0))
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
nPart++;
......@@ -1618,9 +1617,9 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
}
else if (nPart == 1)
{
sPush += rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
newline--;
}
nPart++;
......@@ -1647,9 +1646,9 @@ bool MathType::HandleRecords(int nLevel, sal_uInt8 nSelector,
else if ((nPart == 2) || ((nPart == 1) &&
(nVariation == 0 || nVariation == 1)))
{
sPush+=rRet;
rRet = sPush;
rRet += sMainTerm;
rRet = sPush + rRet + sMainTerm;
sPush.clear();
sMainTerm.clear();
}
nPart++;
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment