writerfilter/Module_writerfilter.mk | 2 +- writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf | 6 ++++++ writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit a4fee33b23fbe68ba4b1a0701c4bfb2bec79e8b5 Author: Miklos Vajna <[email protected]> Date: Tue Jun 11 16:14:50 2013 +0200 abi#4817 attempt to access an element in an empty container Change-Id: Ic51ef8b3db182dd34195c9bb808170d20953d406 diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf new file mode 100644 index 0000000..58d88f5 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/abi4817.rtf @@ -0,0 +1,6 @@ +{\rtf1 +\super +{ +\par +\par } +} diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index b2179c4..c70447e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4591,7 +4591,7 @@ int RTFDocumentImpl::popState() if (aState.pCurrentBuffer == &m_aSuperBuffer) { - OSL_ASSERT(m_aStates.top().pCurrentBuffer == 0); + OSL_ASSERT(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == 0); if (!m_bHasFootnote) replayBuffer(m_aSuperBuffer); commit e75a8b8eff811a1bfdca59fd1eb3e64bea1b02c1 Author: Miklos Vajna <[email protected]> Date: Tue Jun 11 16:17:53 2013 +0200 writerfilter: move the RTF tests to slowcheck These now take around 5sec here, which is slow enough to be annoying -- if you have to wait for it after every partial build. Change-Id: I795fefcd79889aca7b00a5b3d408ee3488b13b03 diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk index fe73d1d..d6a1dc0 100644 --- a/writerfilter/Module_writerfilter.mk +++ b/writerfilter/Module_writerfilter.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,writerfilter,\ Library_writerfilter \ )) -$(eval $(call gb_Module_add_check_targets,writerfilter,\ +$(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\ CppunitTest_writerfilter_rtftok \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
