Kaydet (Commit) 9fbf4fd5 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Caolán McNamara

Related: tdf#75171 wrong "italic" happens on importing MathML

As of 4f294a90, a SmTextNode can be
the sole child of a SmLineNode without being wrapped in a SmExpressionNode.

Change-Id: I3779eb90e216a70566c1151a9b8cb91a9fa36519
Reviewed-on: https://gerrit.libreoffice.org/17613Reviewed-by: 's avatarRegina Henschel <rb.henschel@t-online.de>
Tested-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 78446df2
......@@ -85,21 +85,21 @@ void Test::tearDown()
void Test::testSimple()
{
loadURL(getURLFromSrc("starmath/qa/extras/data/simple.mml"));
OUString sExpected("left ( {italic \"a\" + italic \"b\"} right )^italic \"2\"");
OUString sExpected("left ( {a + b} right )^2");
CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, mxDocShell->GetText());
}
void Test::testNsPrefixMath()
{
loadURL(getURLFromSrc("starmath/qa/extras/data/ns-prefix-math.mml"));
OUString sExpected("left ( {italic \"a\" + italic \"b\"} right )^italic \"2\"");
OUString sExpected("left ( {a + b} right )^2");
CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, mxDocShell->GetText());
}
void Test::testMaction()
{
loadURL(getURLFromSrc("starmath/qa/extras/data/maction.mml"));
OUString sExpected("matrix {italic \"1\" ## italic \"2\" ## italic \"3\"}");
OUString sExpected("matrix {1 ## 2 ## 3}");
CPPUNIT_ASSERT_EQUAL_MESSAGE("loaded text", sExpected, mxDocShell->GetText());
}
......
......@@ -2367,13 +2367,8 @@ void SmTextNode::CreateTextFromNode(OUString &rText)
(pResult->GetNumSubNodes() == 1) )
{
pResult = pResult->GetSubNode(0);
if ( (pResult->GetType() == NEXPRESSION) &&
(pResult->GetNumSubNodes() == 1) )
{
pResult = pResult->GetSubNode(0);
if (pResult->GetType() == NTEXT)
bQuoted=false;
}
if (pResult->GetType() == NTEXT)
bQuoted=false;
}
}
delete pTable;
......
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