diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-13 20:45:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-13 20:45:12 +0100 |
| commit | fa15bd13a974ed29abe1a851f8d7873db26ca455 (patch) | |
| tree | edfb4b6115e582a21dda5cbc0319cf514d392d47 /writerfilter | |
| parent | Fix build for iOS (diff) | |
| download | core-fa15bd13a974ed29abe1a851f8d7873db26ca455.tar.gz core-fa15bd13a974ed29abe1a851f8d7873db26ca455.zip | |
writerfilter: use DomainMapperFactory
Change-Id: I8053676f9aec8f20dc9753c5651a072c5d80c1f2
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index 93ed71f9bed0..87a81da6a345 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -26,7 +26,7 @@ #include <unotools/mediadescriptor.hxx> #include <cppuhelper/supportsservice.hxx> #include <oox/core/filterdetect.hxx> -#include <dmapper/DomainMapper.hxx> +#include <dmapper/DomainMapperFactory.hxx> #include <WriterFilter.hxx> #include <ooxml/OOXMLDocument.hxx> #ifdef DEBUG_WRITERFILTER @@ -89,8 +89,8 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes #endif writerfilter::dmapper::SourceDocumentType eType = writerfilter::dmapper::DOCUMENT_OOXML; - writerfilter::dmapper::DomainMapper* aDomainMapper = new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, uno::Reference<text::XTextRange>()); - writerfilter::Stream::Pointer_t pStream(aDomainMapper); + writerfilter::Stream::Pointer_t pStream( + writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, uno::Reference<text::XTextRange>())); //create the tokenizer and domain mapper writerfilter::ooxml::OOXMLStream::Pointer_t pDocStream = writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext, xInputStream, bRepairStorage); uno::Reference<task::XStatusIndicator> xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), uno::Reference<task::XStatusIndicator>()); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index bb0c9774e232..40f5b3b5c5fc 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -26,7 +26,6 @@ #include <ooxml/QNameToString.hxx> #include <ooxml/resourceids.hxx> #include <oox/token/namespaces.hxx> -#include <dmapper/DomainMapper.hxx> #include <dmapper/GraphicHelpers.hxx> #include <comphelper/embeddedobjectcontainer.hxx> #include <tools/globname.hxx> |