diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:23:42 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:23:42 +0200 |
commit | 8396bffef734a543ee81a742d6d4ac8ed03d046a (patch) | |
tree | a05767e52f735befe97320ecded1fb92e482c04f /writerfilter/source/dmapper | |
parent | 30cc03733bdac1a0057c521834de9226773e2ac9 (diff) |
writerfilter: dmapper ctor can read TextInsertModeRange directly
Change-Id: If17ae09266134b4bc410eab1a1b2f5139ba93a12
Diffstat (limited to 'writerfilter/source/dmapper')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.hxx | 1 | ||||
-rw-r--r-- | writerfilter/source/dmapper/domainmapperfactory.cxx | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 4132d825d0bc..d75e3e4aa91c 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -95,12 +95,12 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon uno::Reference<lang::XComponent> const& xModel, bool bRepairStorage, SourceDocumentType eDocumentType, - uno::Reference<text::XTextRange> const& xInsertTextRange, utl::MediaDescriptor& rMediaDesc) : LoggedProperties("DomainMapper"), LoggedTable("DomainMapper"), LoggedStream("DomainMapper"), - m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType, xInsertTextRange, !rMediaDesc.getUnpackedValueOrDefault("InsertMode", false))), + m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType, rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>()), + !rMediaDesc.getUnpackedValueOrDefault("InsertMode", false))), mbIsSplitPara(false) { // #i24363# tab stops relative to indent diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index e0583691be94..c5a229984a4f 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -80,7 +80,6 @@ public: css::uno::Reference<css::lang::XComponent> const& xModel, bool bRepairStorage, SourceDocumentType eDocumentType, - css::uno::Reference<css::text::XTextRange> const& xInsertTextRange, utl::MediaDescriptor& rMediaDesc); virtual ~DomainMapper(); diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx index 193ae20dfed8..52e568c42111 100644 --- a/writerfilter/source/dmapper/domainmapperfactory.cxx +++ b/writerfilter/source/dmapper/domainmapperfactory.cxx @@ -20,7 +20,6 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno css::uno::Reference<css::lang::XComponent> const& xModel, bool bRepairStorage, SourceDocumentType eDocumentType, - css::uno::Reference<css::text::XTextRange> const& xInsertTextRange, utl::MediaDescriptor& rMediaDesc) { #ifdef DEBUG_WRITERFILTER @@ -32,7 +31,7 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno TagLogger::getInstance().startDocument(); #endif - return Stream::Pointer_t(new DomainMapper(xContext, xInputStream, xModel, bRepairStorage, eDocumentType, xInsertTextRange, rMediaDesc)); + return Stream::Pointer_t(new DomainMapper(xContext, xInputStream, xModel, bRepairStorage, eDocumentType, rMediaDesc)); } } // namespace dmapper |