diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-06 15:57:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-06 15:01:41 +0000 |
| commit | 30af3971d826d55426f51a7beb14c24ac3880250 (patch) | |
| tree | dc6f3cda4fb44fa52426ad223dda4b3a353cb0cc | |
| parent | a5a875940b231b3da5ea23378aa61fefa0a4ac79 (diff) | |
fftester: missing ValueLast
Change-Id: I8e881871b1ae4dea757263d04796779e62e168dc
Reviewed-on: https://gerrit.libreoffice.org/28693
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf | bin | 0 -> 1408 bytes | |||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdispatchsymbol.cxx | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf Binary files differnew file mode 100644 index 000000000000..847e165c5dfa --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/valuelist-1.rtf diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx index 2a4154bd4df1..36f85629f988 100644 --- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx +++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx @@ -253,7 +253,8 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) if ((m_nCellxMax - m_nTopLevelCurrentCellX) >= MINLAY) { auto pXValueLast = m_aStates.top().aTableRowSprms.find(NS_ooxml::LN_CT_TblGridBase_gridCol, false); - auto pXValue = std::make_shared<RTFValue>(pXValueLast->getInt() + m_nCellxMax - m_nTopLevelCurrentCellX); + const int nXValueLast = pXValueLast ? pXValueLast->getInt() : 0; + auto pXValue = std::make_shared<RTFValue>(nXValueLast + m_nCellxMax - m_nTopLevelCurrentCellX); m_aStates.top().aTableRowSprms.eraseLast(NS_ooxml::LN_CT_TblGridBase_gridCol); m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, RTFOverwrite::NO_APPEND); m_nTopLevelCurrentCellX = m_nCellxMax; |