diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-02-21 13:29:42 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-02-21 14:33:23 +0100 |
| commit | fd859ee5802d6fa353526e632b49a8208444769e (patch) | |
| tree | 3b95416fb476cf15dbea3631383e6a3adae799c2 | |
| parent | 8b2e014a99978434b2d973993c93b583ee8a62c7 (diff) | |
Related fdo#38054: Don't crash when opening this document.
The document itself is (I think) corrupted, but we shouldn't crash anyway.
Change-Id: I7ecfaed7003de2976e47992c89bb695a5cdffda4
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 70b73201b713..a5f839c10c76 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1358,7 +1358,7 @@ void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType) try { bool bLeft = eType == SectionPropertyMap::PAGE_LEFT; - if ((!bLeft && !m_pSettingsTable->GetEvenAndOddHeaders()) || (m_pSettingsTable->GetEvenAndOddHeaders())) + if ((!bLeft && !GetSettingsTable()->GetEvenAndOddHeaders()) || (GetSettingsTable()->GetEvenAndOddHeaders())) { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); @@ -1369,7 +1369,7 @@ void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType) // If the 'Different Even & Odd Pages' flag is turned on - do not ignore it // Even if the 'Even' header is blank - the flag should be imported (so it would look in LO like in Word) - if( m_pSettingsTable->GetEvenAndOddHeaders() ) + if (GetSettingsTable()->GetEvenAndOddHeaders()) xPageStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_IS_SHARED), uno::makeAny( false )); //set the interface @@ -1410,7 +1410,7 @@ void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType) try { bool bLeft = eType == SectionPropertyMap::PAGE_LEFT; - if ((!bLeft && !m_pSettingsTable->GetEvenAndOddHeaders()) || (m_pSettingsTable->GetEvenAndOddHeaders())) + if ((!bLeft && !GetSettingsTable()->GetEvenAndOddHeaders()) || (GetSettingsTable()->GetEvenAndOddHeaders())) { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); @@ -1421,7 +1421,7 @@ void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType) // If the 'Different Even & Odd Pages' flag is turned on - do not ignore it // Even if the 'Even' footer is blank - the flag should be imported (so it would look in LO like in Word) - if( m_pSettingsTable->GetEvenAndOddHeaders() ) + if (GetSettingsTable()->GetEvenAndOddHeaders()) xPageStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_IS_SHARED), uno::makeAny( false )); //set the interface @@ -4061,7 +4061,7 @@ void DomainMapper_Impl::ResetParaMarkerRedline( ) void DomainMapper_Impl::ApplySettingsTable() { - if( m_pSettingsTable && m_xTextFactory.is() ) + if (m_pSettingsTable && m_xTextFactory.is()) { try { |