diff options
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b446190c50b6..b9dbda9f1677 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2944,7 +2944,13 @@ static void lcl_PasteRedlines( xCrsr->goRight(redPos[i/3], false); xCrsr->goRight(redLen[i/3], true); uno::Reference < text::XRedline > xRedline( xCrsr, uno::UNO_QUERY_THROW ); - xRedline->makeRedline( sType, aRedlineProperties ); + try { + xRedline->makeRedline( sType, aRedlineProperties ); + } + catch(const uno::Exception&) + { + // ignore (footnotes of tracked deletions) + } } } diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 0263196e6d8c..2c48f121b066 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -170,7 +170,8 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement // send uFtnSep to sign new footnote content, but skip footnote separators if (!Attribs->hasAttribute(W_TOKEN(type)) || ( Attribs->getValue(W_TOKEN(type)) != "separator" && - Attribs->getValue(W_TOKEN(type)) != "continuationSeparator" )) + Attribs->getValue(W_TOKEN(type)) != "continuationSeparator" && + Attribs->getValue(W_TOKEN(type)) != "continuationNotice" )) { mpParserState->setStartFootnote(true); } |