writerperfect/Library_wpftdraw.mk |1
writerperfect/source/draw/CDRImportFilter.cxx |2
writerperfect/source/draw/CDRImportFilter.hxx | 10 -
writerperfect/source/draw/CMXImportFilter.cxx |2
writerperfect/source/draw/CMXImportFilter.hxx | 10 -
writerperfect/source/draw/DocumentHandlerForOdg.hxx | 31 +++
writerperfect/source/draw/FreehandImportFilter.cxx |2
writerperfect/source/draw/FreehandImportFilter.hxx | 10 -
writerperfect/source/draw/ImportFilterBase.cxx | 183
writerperfect/source/draw/ImportFilterBase.hxx | 115
writerperfect/source/draw/MSPUBImportFilter.cxx |2
writerperfect/source/draw/MSPUBImportFilter.hxx | 10 -
writerperfect/source/draw/MWAWDrawImportFilter.cxx |2
writerperfect/source/draw/MWAWDrawImportFilter.hxx | 10 -
writerperfect/source/draw/PageMakerImportFilter.cxx |2
writerperfect/source/draw/PageMakerImportFilter.hxx | 10 -
writerperfect/source/draw/VisioImportFilter.cxx |2
writerperfect/source/draw/VisioImportFilter.hxx | 10 -
writerperfect/source/draw/WPGImportFilter.cxx |2
writerperfect/source/draw/WPGImportFilter.hxx | 10 -
20 files changed, 87 insertions(+), 339 deletions(-)
New commits:
commit bddd965764130656ee8daf84b592de6de3c1db4f
Author: Takeshi Abe
Date: Mon Oct 20 22:34:24 2014 +0900
fdo#84168 change writerperfect filters to use a new base class template
in writerperfect/source/draw.
Change-Id: I8ec2861da2af1e203157faa1319b837fe236b507
Reviewed-on: https://gerrit.libreoffice.org/12072
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/writerperfect/Library_wpftdraw.mk
b/writerperfect/Library_wpftdraw.mk
index c3a3ce0..29409c1 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,wpftdraw,\
writerperfect/source/draw/CDRImportFilter \
writerperfect/source/draw/CMXImportFilter \
writerperfect/source/draw/FreehandImportFilter \
- writerperfect/source/draw/ImportFilterBase \
writerperfect/source/draw/MSPUBImportFilter \
writerperfect/source/draw/MWAWDrawImportFilter \
writerperfect/source/draw/PageMakerImportFilter \
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx
b/writerperfect/source/draw/CDRImportFilter.cxx
index 8bb8fe8..e5671da 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool CDRImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
+bool CDRImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
OdgGenerator &rGenerator, utl::MediaDescriptor &)
{
return libcdr::CDRDocument::parse(&rInput, &rGenerator);
}
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx
b/writerperfect/source/draw/CDRImportFilter.hxx
index f2a4d45..7754ac8 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -11,16 +11,18 @@
#ifndef _CDRIMPORTFILTER_HXX
#define _CDRIMPORTFILTER_HXX
-#include "ImportFilterBase.hxx"
+#include "writerperfect/ImportFilter.hxx"
+
+#include "DocumentHandlerForOdg.hxx"
/* This component will be instantiated for both import or export. Whether it
calls
* setSourceDocument or setTargetDocument determines which Impl function the
filter
* member calls */
-class CDRImportFilter : public writerperfect::draw::ImportFilterBase
+class CDRImportFilter : public writerperfect::ImportFilter
{
public:
CDRImportFilter(const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > &rxContext)
-: writerperfect::draw::ImportFilterBase(rxContext)
+: writerperfect::ImportFilter(rxContext)
{
}
@@ -34,7 +36,7 @@ public:
private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString
&rTypeName) SAL_OVERRIDE;
-virtual bool doImportDocument(librevenge::RVNGInputStream &rInput,
librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
SAL_OVERRIDE;
+virtual bool doImportDocument(librevenge::RVNGInputStream &rInput,
OdgGenerator &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
};
OUString CDRImportFilter_getImplementationName()
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx
b/writerperfect/source/draw/CMXImportFilter.cxx
index 120e985..2670706 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno: