diff options
| -rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 14 | ||||
| -rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index cf1b31aeb016..bfa9a208786e 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -35,6 +35,7 @@ #include <unotools/mediadescriptor.hxx> #include <unotools/streamwrap.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <comphelper/scopeguard.hxx> #include <dmapper/DomainMapperFactory.hxx> #include <rtftok/RTFDocument.hxx> @@ -102,6 +103,13 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto xDocProps.set(m_xDstDoc, uno::UNO_QUERY); xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(true)); } + comphelper::ScopeGuard g([xDocProps] { + if (xDocProps.is()) // not in cppunittest? + { + // note: pStream.clear calls RemoveLastParagraph() + xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(false)); + } + }); try { @@ -166,12 +174,6 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto TOOLS_INFO_EXCEPTION("writerfilter", "Exception caught"); } - if (m_xDstDoc.is()) // not in cppunittest? - { - // note: pStream.clear calls RemoveLastParagraph() - xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(false)); - } - if (xStatusIndicator.is()) xStatusIndicator->end(); return bResult; diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index a043dcb2764a..5e14545b9e11 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -44,6 +44,7 @@ #include <rtl/ref.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> +#include <comphelper/scopeguard.hxx> using namespace ::com::sun::star; @@ -157,6 +158,9 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri { uno::Reference<beans::XPropertySet> const xDocProps(m_xDstDoc, uno::UNO_QUERY); xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(true)); + comphelper::ScopeGuard g([xDocProps] { + xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(false)); + }); utl::MediaDescriptor aMediaDesc(rDescriptor); bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false); bool bSkipImages @@ -283,7 +287,6 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri pStream.clear(); // note: pStream.clear calls RemoveLastParagraph() - xDocProps->setPropertyValue("UndocumentedWriterfilterHack", uno::makeAny(false)); return true; } |