diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-29 21:29:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-29 21:29:03 +0100 |
| commit | 4e58115b2d7f80450b40e27187e45e3ac9babde0 (patch) | |
| tree | e59740b2dca53e93eb16497ed1f30576db65dc84 /writerfilter | |
| parent | d00fc303bca7765762a602531b7d3b40ce8f1740 (diff) | |
fftester: some more table manager stack checks
Change-Id: Ic8dd72da175fee656889910b55d31ea161b944cc
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf | bin | 0 -> 54 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf Binary files differnew file mode 100644 index 000000000000..9fd58921468a --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-3.rtf diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index f6e51162cf63..6ca8528f59ce 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -213,7 +213,7 @@ DomainMapper::~DomainMapper() void DomainMapper::lcl_attribute(Id nName, Value & val) { - if (m_pImpl->getTableManager().attribute(nName, val)) + if (m_pImpl->hasTableManager() && m_pImpl->getTableManager().attribute(nName, val)) return; static const int nSingleLineSpacing = 240; @@ -414,7 +414,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) else aSpacing.Height = sal_Int16(ConversionHelper::convertTwipToMM100( nIntValue )); - if( m_pImpl->getTableManager().isInCell() ) + if (m_pImpl->hasTableManager() && m_pImpl->getTableManager().isInCell()) { // direct formatting is applied for table cell data TablePropertyMapPtr pTblCellWithDirectFormatting(new TablePropertyMap); @@ -443,7 +443,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) aSpacing.Mode = style::LineSpacingMode::FIX; } - if( m_pImpl->getTableManager().isInCell() ) + if (m_pImpl->hasTableManager() && m_pImpl->getTableManager().isInCell()) { // If the table manager got the line rule after // ooxml::CT_Spacing_line, then it should get the rule |