diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-02-21 13:29:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-11 15:45:45 +0200 |
| commit | 93caffa2c9c0745f00fbf21c554ba56f01d30da5 (patch) | |
| tree | 01f3a0bf230bb1c39e407997b4a3374f6535ffb5 /writerfilter | |
| parent | 3ec421b08432822708fc8541f342bcb7851d3888 (diff) | |
Related fdo#38054 fdo#82114: Don't crash when opening this document.
The document itself is (I think) corrupted, but we shouldn't crash anyway.
(cherry picked from commit fd859ee5802d6fa353526e632b49a8208444769e)
Change-Id: I7ecfaed7003de2976e47992c89bb695a5cdffda4
Diffstat (limited to 'writerfilter')
| -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 47f3a41b0b9d..b70c3af2c323 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1528,7 +1528,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(); @@ -1539,7 +1539,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 @@ -1580,7 +1580,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(); @@ -1591,7 +1591,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 @@ -4275,7 +4275,7 @@ void DomainMapper_Impl::ResetParaRedline( ) void DomainMapper_Impl::ApplySettingsTable() { - if( m_pSettingsTable && m_xTextFactory.is() ) + if (m_pSettingsTable && m_xTextFactory.is()) { try { |