writerfilter/inc/dmapper/DomainMapperFactory.hxx | 6 +++---
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 4 ++--
writerfilter/source/filter/ImportFilter.cxx | 2 +-
writerfilter/source/filter/RtfFilter.cxx | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 3f62ee6e371e3a922d6f4e4b5368271c18fc4f69
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Dec 25 12:21:07 2014 +0100
writerfilter: turn SourceDocumentType into a C++11 scoped enumeration
Change-Id: I11c550d0ec5a10f17116ac8f7025c0283e292f2e
diff --git a/writerfilter/inc/dmapper/DomainMapperFactory.hxx
b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
index 39a9aa7..306870a 100644
--- a/writerfilter/inc/dmapper/DomainMapperFactory.hxx
+++ b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
@@ -25,10 +25,10 @@ namespace writerfilter
namespace dmapper
{
-enum SourceDocumentType
+enum class SourceDocumentType
{
- DOCUMENT_OOXML,
- DOCUMENT_RTF
+ OOXML,
+ RTF
};
/// Interface to create a DomainMapper instance.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 3cabbf5..d93657a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -710,9 +710,9 @@ public:
DeletableTabStop m_aCurrentTabStop;
- bool IsOOXMLImport() const { return m_eDocumentType == DOCUMENT_OOXML; }
+ bool IsOOXMLImport() const { return m_eDocumentType ==
SourceDocumentType::OOXML; }
- bool IsRTFImport() const { return m_eDocumentType == DOCUMENT_RTF; }
+ bool IsRTFImport() const { return m_eDocumentType ==
SourceDocumentType::RTF; }
void InitPageMargins() { m_aPageMargins = _PageMar(); }
void SetPageMarginTwip( PageMarElement eElement, sal_Int32 nValue );
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index ed9e57d..d14ce08 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -76,7 +76,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence<
beans::PropertyValue >& aDes
if ( !xInputStream.is() )
return sal_False;
- writerfilter::dmapper::SourceDocumentType eType =
writerfilter::dmapper::DOCUMENT_OOXML;
+ writerfilter::dmapper::SourceDocumentType eType =
writerfilter::dmapper::SourceDocumentType::OOXML;
writerfilter::Stream::Pointer_t pStream(
writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext,
xInputStream, m_xDstDoc, bRepairStorage, eType,
uno::Reference<text::XTextRange>(), aMediaDesc));
//create the tokenizer and domain mapper
diff --git a/writerfilter/source/filter/RtfFilter.cxx
b/writerfilter/source/filter/RtfFilter.cxx
index 2ae224d..cd55a85 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -101,8 +101,9 @@ sal_Bool RtfFilter::filter(const uno::Sequence<
beans::PropertyValue >& aDescrip
xStatusIndicator =
aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(),
uno::Reference<task::XStatusIndicator>());
+ writerfilter::dmapper::SourceDocumentType eType =
writerfilter::dmapper::SourceDocumentType::RTF;
writerfilter::Stream::Pointer_t pStream(
-
writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext,
xInputStream, m_xDstDoc, bRepairStorage, writerfilter::dmapper::DOCUMENT_RTF,
xInsertTextRange, aMediaDesc));
+
writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext,
xInputStream, m_xDstDoc, bRepairStorage, eType, xInsertTextRange, aMediaDesc));
writerfilter::rtftok::RTFDocument::Pointer_t const pDocument(
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext,
xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
pDocument->resolve(*pStream);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
