Kaydet (Commit) f9ae1b31 authored tarafından Caolán McNamara's avatar Caolán McNamara

fftester: another null DestinationText

Change-Id: I84bf3788ac092c491d7c5a9f86421f1cf9f3e814
üst 0dd22165
......@@ -190,26 +190,27 @@ static util::DateTime lcl_getDateTime(RTFParserState& aState)
aState.nDay, aState.nMonth, aState.nYear, false);
}
static void lcl_DestinationToMath(OUStringBuffer& rDestinationText, oox::formulaimport::XmlStreamBuilder& rMathBuffer, bool& rMathNor)
static void lcl_DestinationToMath(OUStringBuffer* pDestinationText, oox::formulaimport::XmlStreamBuilder& rMathBuffer, bool& rMathNor)
{
OUString aStr = rDestinationText.makeStringAndClear();
if (!aStr.isEmpty())
if (!pDestinationText)
return;
OUString aStr = pDestinationText->makeStringAndClear();
if (aStr.isEmpty())
return;
rMathBuffer.appendOpeningTag(M_TOKEN(r));
if (rMathNor)
{
rMathBuffer.appendOpeningTag(M_TOKEN(r));
if (rMathNor)
{
rMathBuffer.appendOpeningTag(M_TOKEN(rPr));
// Same as M_TOKEN(lit)
rMathBuffer.appendOpeningTag(M_TOKEN(nor));
rMathBuffer.appendClosingTag(M_TOKEN(nor));
rMathBuffer.appendClosingTag(M_TOKEN(rPr));
rMathNor = false;
}
rMathBuffer.appendOpeningTag(M_TOKEN(t));
rMathBuffer.appendCharacters(aStr);
rMathBuffer.appendClosingTag(M_TOKEN(t));
rMathBuffer.appendClosingTag(M_TOKEN(r));
rMathBuffer.appendOpeningTag(M_TOKEN(rPr));
// Same as M_TOKEN(lit)
rMathBuffer.appendOpeningTag(M_TOKEN(nor));
rMathBuffer.appendClosingTag(M_TOKEN(nor));
rMathBuffer.appendClosingTag(M_TOKEN(rPr));
rMathNor = false;
}
rMathBuffer.appendOpeningTag(M_TOKEN(t));
rMathBuffer.appendCharacters(aStr);
rMathBuffer.appendClosingTag(M_TOKEN(t));
rMathBuffer.appendClosingTag(M_TOKEN(r));
}
RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& xContext,
......@@ -1768,7 +1769,7 @@ RTFError RTFDocumentImpl::pushState()
m_aStates.top().eRunType = RTFParserState::RunType::LOCH;
if (m_aStates.top().eDestination == Destination::MR)
lcl_DestinationToMath(*m_aStates.top().pDestinationText, m_aMathBuffer, m_bMathNor);
lcl_DestinationToMath(m_aStates.top().pDestinationText, m_aMathBuffer, m_bMathNor);
m_aStates.push(m_aStates.top());
}
m_aStates.top().aDestinationText.setLength(0); // was copied: always reset!
......@@ -2463,7 +2464,7 @@ RTFError RTFDocumentImpl::popState()
}
break;
case Destination::MR:
lcl_DestinationToMath(*m_aStates.top().pDestinationText, m_aMathBuffer, m_bMathNor);
lcl_DestinationToMath(m_aStates.top().pDestinationText, m_aMathBuffer, m_bMathNor);
break;
case Destination::MF:
m_aMathBuffer.appendClosingTag(M_TOKEN(f));
......
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