mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftester: another null DestinationText

Browse Source 
Change-Id: I84bf3788ac092c491d7c5a9f86421f1cf9f3e814
This commit is contained in:
Caolán McNamara
2016-07-29 09:18:16 +01:00
parent 0dd2216534
commit f9ae1b31f7
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
writerfilter/qa/cppunittests/rtftok/data/pass/destinationtest-1.rtf → writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf
View File

BIN
writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf Normal file
View File

Binary file not shown.

39
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

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