wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

fftester: another table manager stack checks

Browse Source 
and a m_xTextFactory check too

Change-Id: I9352410c42048b4dd7d6dbc3514351ab8f16790b
This commit is contained in:
Caolán McNamara
2016-07-31 19:58:18 +01:00
parent d5f4bcb2c1
commit 8a6b2fb5b9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf Normal file
View File

Binary file not shown.

4
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View File

@ -1034,7 +1034,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap )
TagLogger::getInstance().attribute("isTextAppend", sal_uInt32(xTextAppend.is()));
#endif
if (xTextAppend.is() && pParaContext != nullptr && !getTableManager().isIgnore())
if (xTextAppend.is() && pParaContext && hasTableManager() && !getTableManager().isIgnore())
{
try
{
@ -4198,7 +4198,7 @@ void DomainMapper_Impl::CloseFieldCommand()
*/
OUString aCode( pContext->GetCommand().trim() );
// Don't waste resources on wrapping shapes inside a fieldmark.
if (aCode != "SHAPE")
if (aCode != "SHAPE" && m_xTextFactory.is())
{
xFieldInterface = m_xTextFactory->createInstance("com.sun.star.text.Fieldmark");
const uno::Reference<text::XTextContent> xTextContent(xFieldInterface, uno::UNO_QUERY_THROW);