diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-22 09:12:26 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-22 09:13:04 +0200 |
commit | 44bee388a3b1e1615e0c573941f877d67cbba6c3 (patch) | |
tree | e981aac3478496c0c5df78474214f17cc878e488 /writerfilter | |
parent | 024f722ea390cc49e925a94a53512e79b583cb54 (diff) |
writerfilter: it's enough if dmapper gives the media descriptor to its impl
Change-Id: Ia973799453d9ede60be3699ff8973e31605f06ef
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 97259edebcb7..07350c9aa018 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -66,7 +66,6 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/sequence.hxx> #include <filter/msfilter/util.hxx> -#include <unotools/mediadescriptor.hxx> #include <TextEffectsHandler.hxx> #include <CellColorHandler.hxx> @@ -99,8 +98,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon LoggedProperties("DomainMapper"), LoggedTable("DomainMapper"), LoggedStream("DomainMapper"), - m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType, rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>()), - !rMediaDesc.getUnpackedValueOrDefault("InsertMode", false))), + m_pImpl(new DomainMapper_Impl(*this, xContext, xModel, eDocumentType, rMediaDesc)), mbIsSplitPara(false) { // #i24363# tab stops relative to indent diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index ec8129a5f3ee..c51d4eac0390 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -81,6 +81,7 @@ #include <filter/msfilter/util.hxx> #include <comphelper/sequence.hxx> #include <comphelper/propertyvalue.hxx> +#include <unotools/mediadescriptor.hxx> using namespace ::com::sun::star; using namespace oox; @@ -175,8 +176,7 @@ DomainMapper_Impl::DomainMapper_Impl( uno::Reference<uno::XComponentContext> const& xContext, uno::Reference<lang::XComponent> const& xModel, SourceDocumentType eDocumentType, - uno::Reference<text::XTextRange> const& xInsertTextRange, - bool bIsNewDoc) : + utl::MediaDescriptor& rMediaDesc) : m_eDocumentType( eDocumentType ), m_rDMapper( rDMapper ), m_xTextDocument( xModel, uno::UNO_QUERY ), @@ -227,8 +227,8 @@ DomainMapper_Impl::DomainMapper_Impl( m_xAnnotationField(), m_nAnnotationId( -1 ), m_aAnnotationPositions(), - m_xInsertTextRange(xInsertTextRange), - m_bIsNewDoc(bIsNewDoc), + m_xInsertTextRange(rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>())), + m_bIsNewDoc(!rMediaDesc.getUnpackedValueOrDefault("InsertMode", false)), m_bInTableStyleRunProps(false), m_nTableDepth(0), m_bHasFtnSep(false), diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 55d059da7af3..2d0d60aad0ea 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -471,8 +471,7 @@ public: css::uno::Reference < css::uno::XComponentContext > const& xContext, css::uno::Reference< css::lang::XComponent > const& xModel, SourceDocumentType eDocumentType, - css::uno::Reference< css::text::XTextRange > const& xInsertTextRange, - bool bIsNewDoc ); + utl::MediaDescriptor& rMediaDesc); virtual ~DomainMapper_Impl(); SectionPropertyMap* GetLastSectionContext( ) |