diff options
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 1371b7cc0e32..4e769e15b0cf 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3504,13 +3504,11 @@ void DomainMapper_Impl::PopFootOrEndnote() uno::Reference< text::XFootnote > xFootnoteFirst, xFootnoteLast; auto xFootnotes = xFootnotesSupplier->getFootnotes(); auto xEndnotes = xEndnotesSupplier->getEndnotes(); - if (IsInFootnote()) - xFootnotes->getByIndex(xFootnotes->getCount()-1) >>= xFootnoteLast; - else - xEndnotes->getByIndex(xEndnotes->getCount()-1) >>= xFootnoteLast; - if ( ( ( IsInFootnote() && xFootnotes->getCount() > 1 ) || - ( !IsInFootnote() && xEndnotes->getCount() > 1 ) ) && - xFootnoteLast->getLabel().isEmpty() ) + if ( ( ( IsInFootnote() && xFootnotes->getCount() > 1 && + ( xFootnotes->getByIndex(xFootnotes->getCount()-1) >>= xFootnoteLast ) ) || + ( !IsInFootnote() && xEndnotes->getCount() > 1 && + ( xEndnotes->getByIndex(xEndnotes->getCount()-1) >>= xFootnoteLast ) ) + ) && xFootnoteLast->getLabel().isEmpty() ) { // copy content of the first remaining temporary footnote if ( IsInFootnote() ) |