Kaydet (Commit) 4e58115b authored tarafından Caolán McNamara's avatar Caolán McNamara

fftester: some more table manager stack checks

Change-Id: Ic8dd72da175fee656889910b55d31ea161b944cc
üst d00fc303
...@@ -213,7 +213,7 @@ DomainMapper::~DomainMapper() ...@@ -213,7 +213,7 @@ DomainMapper::~DomainMapper()
void DomainMapper::lcl_attribute(Id nName, Value & val) 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; return;
static const int nSingleLineSpacing = 240; static const int nSingleLineSpacing = 240;
...@@ -414,7 +414,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) ...@@ -414,7 +414,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
else else
aSpacing.Height = sal_Int16(ConversionHelper::convertTwipToMM100( nIntValue )); 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 // direct formatting is applied for table cell data
TablePropertyMapPtr pTblCellWithDirectFormatting(new TablePropertyMap); TablePropertyMapPtr pTblCellWithDirectFormatting(new TablePropertyMap);
...@@ -443,7 +443,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) ...@@ -443,7 +443,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
aSpacing.Mode = style::LineSpacingMode::FIX; 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 // If the table manager got the line rule after
// ooxml::CT_Spacing_line, then it should get the rule // ooxml::CT_Spacing_line, then it should get the rule
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment