[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - bin/get-bugzilla-attachments-by-mimetype configure.ac filter/Configuration_filter.mk filter/source writerperfect/Library_wpftcalc.mk writerperfect/Library_wpftwriter.mk writerperfect/qa writerperfect/source
David Tardon
dtardon at redhat.com
Wed May 20 06:17:57 PDT 2015
bin/get-bugzilla-attachments-by-mimetype | 4
configure.ac | 2
filter/Configuration_filter.mk | 4
filter/source/config/fragments/filters/AppleNumbers.xcu | 29 +++
filter/source/config/fragments/filters/ApplePages.xcu | 29 +++
filter/source/config/fragments/types/calc_AppleNumbers.xcu | 29 +++
filter/source/config/fragments/types/writer_ApplePages.xcu | 29 +++
writerperfect/Library_wpftcalc.mk | 2
writerperfect/Library_wpftwriter.mk | 2
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 1
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 1
writerperfect/qa/unit/data/calc/libetonyek/pass/Numbers_2.numbers |binary
writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_4.pages |binary
writerperfect/source/calc/NumbersImportFilter.cxx | 91 ++++++++++
writerperfect/source/calc/NumbersImportFilter.hxx | 54 +++++
writerperfect/source/calc/wpftcalc.component | 4
writerperfect/source/calc/wpftcalc_genericfilter.cxx | 6
writerperfect/source/writer/PagesImportFilter.cxx | 87 +++++++++
writerperfect/source/writer/PagesImportFilter.hxx | 53 +++++
writerperfect/source/writer/wpftwriter.component | 4
writerperfect/source/writer/wpftwriter_genericfilter.cxx | 6
21 files changed, 436 insertions(+), 1 deletion(-)
New commits:
commit 9aba01c25af91848bd3792889349790b4e558489
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 20 14:09:31 2015 +0200
enable Apple Numbers import
Change-Id: I9aaa4ae2e567b54f15097c265a3d1c3c12662b92
(cherry picked from commit a1202971e5b27ac4585cde73ed15f395c242cae3)
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 1c87589..ea92bb8 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -422,8 +422,10 @@ mimetypes = {
'application/clarisworks' : 'cwk',
'application/macwriteii' : 'mw',
'application/vnd.apple.keynote': 'key',
+ 'application/vnd.apple.numbers': 'numbers',
'application/vnd.apple.pages': 'pages',
'application/x-iwork-keynote-sffkey': 'key',
+ 'application/x-iwork-numbers-sffnumbers': 'numbers',
'application/x-iwork-pages-sffpages': 'pages',
'application/x-hwp': 'hwp',
'application/x-aportisdoc': 'pdb',
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 91ef26f..29e672b 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -518,6 +518,7 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,f
calc_Great_Works \
calc_Mac_Works \
calc_Mac_Wingz \
+ calc_AppleNumbers \
))
$(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\
@@ -558,6 +559,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x
Great_Works_Calc \
Mac_Wingz_Calc \
Mac_Works_Calc \
+ AppleNumbers \
))
# fcfg_draw
diff --git a/filter/source/config/fragments/filters/AppleNumbers.xcu b/filter/source/config/fragments/filters/AppleNumbers.xcu
new file mode 100644
index 0000000..eced344
--- /dev/null
+++ b/filter/source/config/fragments/filters/AppleNumbers.xcu
@@ -0,0 +1,29 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<node oor:name="Apple Numbers" oor:op="replace">
+ <prop oor:name="Flags">
+ <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value>
+ </prop>
+ <prop oor:name="FilterService">
+ <value>org.libreoffice.comp.Calc.NumbersImportFilter</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">Apple Numbers 2</value>
+ </prop>
+ <prop oor:name="FileFormatVersion">
+ <value>0</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>calc_AppleNumbers</value>
+ </prop>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.sheet.SpreadsheetDocument</value>
+ </prop>
+</node>
diff --git a/filter/source/config/fragments/types/calc_AppleNumbers.xcu b/filter/source/config/fragments/types/calc_AppleNumbers.xcu
new file mode 100644
index 0000000..d2030b8
--- /dev/null
+++ b/filter/source/config/fragments/types/calc_AppleNumbers.xcu
@@ -0,0 +1,29 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<node oor:name="calc_AppleNumbers" oor:op="replace">
+ <prop oor:name="DetectService">
+ <value>org.libreoffice.comp.Calc.NumbersImportFilter</value>
+ </prop>
+ <prop oor:name="Extensions">
+ <value>numbers</value>
+ </prop>
+ <prop oor:name="MediaType">
+ <value>application/x-iwork-numbers-sffnumbers</value>
+ </prop>
+ <prop oor:name="Preferred">
+ <value>true</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>Apple Numbers</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value>Apple Numbers</value>
+ </prop>
+</node>
diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk
index a68aa48..18cc378 100644
--- a/writerperfect/Library_wpftcalc.mk
+++ b/writerperfect/Library_wpftcalc.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,wpftcalc,\
$(eval $(call gb_Library_use_externals,wpftcalc,\
boost_headers \
+ etonyek \
odfgen \
revenge \
mwaw \
@@ -59,6 +60,7 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\
$(eval $(call gb_Library_add_exception_objects,wpftcalc,\
writerperfect/source/calc/MSWorksCalcImportFilter \
writerperfect/source/calc/MWAWCalcImportFilter \
+ writerperfect/source/calc/NumbersImportFilter \
writerperfect/source/calc/wpftcalc_genericfilter \
))
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 6af5c04..40d1ace 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -33,6 +33,7 @@ void WpftCalcFilterTest::test()
{
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/");
doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", "/writerperfect/qa/unit/data/calc/libwps/");
+ doTest("org.libreoffice.comp.Calc.NumbersImportFilter", "/writerperfect/qa/unit/data/calc/libetonyek/");
}
CPPUNIT_TEST_SUITE_REGISTRATION(WpftCalcFilterTest);
diff --git a/writerperfect/qa/unit/data/calc/libetonyek/fail/.gitignore b/writerperfect/qa/unit/data/calc/libetonyek/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/calc/libetonyek/indeterminate/.gitignore b/writerperfect/qa/unit/data/calc/libetonyek/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/calc/libetonyek/pass/Numbers_2.numbers b/writerperfect/qa/unit/data/calc/libetonyek/pass/Numbers_2.numbers
new file mode 100644
index 0000000..307a49c
Binary files /dev/null and b/writerperfect/qa/unit/data/calc/libetonyek/pass/Numbers_2.numbers differ
diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx b/writerperfect/source/calc/NumbersImportFilter.cxx
new file mode 100644
index 0000000..ba8cf0e
--- /dev/null
+++ b/writerperfect/source/calc/NumbersImportFilter.cxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* NumbersImportFilter: Sets up the filter, and calls DocumentCollector
+ * to do the actual filtering
+ *
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <libetonyek/libetonyek.h>
+
+#include <com/sun/star/uno/Reference.h>
+
+#include <cppuhelper/supportsservice.hxx>
+
+#include "NumbersImportFilter.hxx"
+
+using com::sun::star::uno::Sequence;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::Any;
+using com::sun::star::uno::XInterface;
+using com::sun::star::uno::Exception;
+using com::sun::star::uno::RuntimeException;
+using com::sun::star::uno::XComponentContext;
+
+using libetonyek::EtonyekDocument;
+
+bool NumbersImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, OdsGenerator &rGenerator, utl::MediaDescriptor &)
+{
+ return EtonyekDocument::parse(&rInput, &rGenerator);
+}
+
+bool NumbersImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
+{
+ EtonyekDocument::Type type = EtonyekDocument::TYPE_UNKNOWN;
+ const EtonyekDocument::Confidence confidence = EtonyekDocument::isSupported(&rInput, &type);
+ if ((confidence == EtonyekDocument::CONFIDENCE_EXCELLENT) && (type == EtonyekDocument::TYPE_NUMBERS))
+ {
+ rTypeName = "calc_AppleNumbers";
+ return true;
+ }
+
+ return false;
+}
+
+void NumbersImportFilter::doRegisterHandlers(OdsGenerator &)
+{
+}
+
+OUString NumbersImportFilter_getImplementationName()
+throw (RuntimeException)
+{
+ return OUString("org.libreoffice.comp.Calc.NumbersImportFilter");
+}
+
+Sequence< OUString > SAL_CALL NumbersImportFilter_getSupportedServiceNames()
+throw (RuntimeException)
+{
+ Sequence < OUString > aRet(2);
+ OUString *pArray = aRet.getArray();
+ pArray[0] = "com.sun.star.document.ImportFilter";
+ pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
+ return aRet;
+}
+
+Reference< XInterface > SAL_CALL NumbersImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
+{
+ return static_cast<cppu::OWeakObject *>(new NumbersImportFilter(rContext));
+}
+
+// XServiceInfo
+OUString SAL_CALL NumbersImportFilter::getImplementationName()
+throw (RuntimeException, std::exception)
+{
+ return NumbersImportFilter_getImplementationName();
+}
+sal_Bool SAL_CALL NumbersImportFilter::supportsService(const OUString &rServiceName)
+throw (RuntimeException, std::exception)
+{
+ return cppu::supportsService(this, rServiceName);
+}
+Sequence< OUString > SAL_CALL NumbersImportFilter::getSupportedServiceNames()
+throw (RuntimeException, std::exception)
+{
+ return NumbersImportFilter_getSupportedServiceNames();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/calc/NumbersImportFilter.hxx b/writerperfect/source/calc/NumbersImportFilter.hxx
new file mode 100644
index 0000000..5b38964
--- /dev/null
+++ b/writerperfect/source/calc/NumbersImportFilter.hxx
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_NUMBERSIMPORTFILTER_HXX
+#define INCLUDED_WRITERPERFECT_SOURCE_WRITER_NUMBERSIMPORTFILTER_HXX
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+#include "DocumentHandlerForOds.hxx"
+#include "ImportFilter.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 NumbersImportFilter : public writerperfect::ImportFilter<OdsGenerator>
+{
+public:
+ NumbersImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::ImportFilter<OdsGenerator>(rxContext) {}
+
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+private:
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdsGenerator &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
+ virtual void doRegisterHandlers(OdsGenerator &rGenerator) SAL_OVERRIDE;
+};
+
+OUString NumbersImportFilter_getImplementationName()
+throw (::com::sun::star::uno::RuntimeException);
+
+::com::sun::star::uno::Sequence< OUString > SAL_CALL NumbersImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
+
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+SAL_CALL NumbersImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/calc/wpftcalc.component b/writerperfect/source/calc/wpftcalc.component
index 68c5f85..9216b33 100644
--- a/writerperfect/source/calc/wpftcalc.component
+++ b/writerperfect/source/calc/wpftcalc.component
@@ -17,4 +17,8 @@
<service name="com.sun.star.document.ImportFilter"/>
<service name="com.sun.star.document.ExtendedTypeDetection"/>
</implementation>
+ <implementation name="org.libreoffice.comp.Calc.NumbersImportFilter">
+ <service name="com.sun.star.document.ImportFilter"/>
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ </implementation>
</component>
diff --git a/writerperfect/source/calc/wpftcalc_genericfilter.cxx b/writerperfect/source/calc/wpftcalc_genericfilter.cxx
index 9738c34..7ebe8f5 100644
--- a/writerperfect/source/calc/wpftcalc_genericfilter.cxx
+++ b/writerperfect/source/calc/wpftcalc_genericfilter.cxx
@@ -31,6 +31,7 @@
#include "MSWorksCalcImportFilter.hxx"
#include "MWAWCalcImportFilter.hxx"
+#include "NumbersImportFilter.hxx"
namespace
{
@@ -47,6 +48,11 @@ static cppu::ImplementationEntry const services[] =
&MWAWCalcImportFilter_getSupportedServiceNames,
&cppu::createSingleComponentFactory, 0, 0
},
+ {
+ &NumbersImportFilter_createInstance, &NumbersImportFilter_getImplementationName,
+ &NumbersImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
{ 0, 0, 0, 0, 0, 0 }
};
commit b025a9bb81fdbf4e97cbf683afb880d8e3890a9d
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 20 13:21:06 2015 +0200
enable Apple Pages import
Change-Id: I1ae1a09de43a2743d6bf9eba0c9a389b99bdfc67
(cherry picked from commit d5ffc8b0adacf31e88156588f57db3149f430ad3)
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 8b0b4c5..1c87589 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -422,7 +422,9 @@ mimetypes = {
'application/clarisworks' : 'cwk',
'application/macwriteii' : 'mw',
'application/vnd.apple.keynote': 'key',
+ 'application/vnd.apple.pages': 'pages',
'application/x-iwork-keynote-sffkey': 'key',
+ 'application/x-iwork-pages-sffpages': 'pages',
'application/x-hwp': 'hwp',
'application/x-aportisdoc': 'pdb',
'application/prs.plucker' : 'pdb_plucker',
diff --git a/configure.ac b/configure.ac
index 0207704..16f0520 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7585,7 +7585,7 @@ libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1])
dnl ===================================================================
dnl Check for system libetonyek
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.1])
+libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.2])
dnl ===================================================================
dnl Check for system libfreehand
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index c2d2076..91ef26f 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -369,6 +369,7 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_Plucker_eBook \
writer_TealDoc \
writer_zTXT \
+ writer_ApplePages \
))
$(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\
@@ -431,6 +432,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
Plucker_eBook \
TealDoc \
zTXT \
+ ApplePages \
))
# fcfg_web
diff --git a/filter/source/config/fragments/filters/ApplePages.xcu b/filter/source/config/fragments/filters/ApplePages.xcu
new file mode 100644
index 0000000..4b77277
--- /dev/null
+++ b/filter/source/config/fragments/filters/ApplePages.xcu
@@ -0,0 +1,29 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<node oor:name="Apple Pages" oor:op="replace">
+ <prop oor:name="Flags">
+ <value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value>
+ </prop>
+ <prop oor:name="FilterService">
+ <value>org.libreoffice.comp.Writer.PagesImportFilter</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">Apple Pages 4</value>
+ </prop>
+ <prop oor:name="FileFormatVersion">
+ <value>0</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>writer_ApplePages</value>
+ </prop>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.text.TextDocument</value>
+ </prop>
+</node>
diff --git a/filter/source/config/fragments/types/writer_ApplePages.xcu b/filter/source/config/fragments/types/writer_ApplePages.xcu
new file mode 100644
index 0000000..823a766
--- /dev/null
+++ b/filter/source/config/fragments/types/writer_ApplePages.xcu
@@ -0,0 +1,29 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<node oor:name="writer_ApplePages" oor:op="replace">
+ <prop oor:name="DetectService">
+ <value>org.libreoffice.comp.Writer.PagesImportFilter</value>
+ </prop>
+ <prop oor:name="Extensions">
+ <value>pages</value>
+ </prop>
+ <prop oor:name="MediaType">
+ <value>application/x-iwork-pages-sffpages</value>
+ </prop>
+ <prop oor:name="Preferred">
+ <value>true</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>Apple Pages</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value>Apple Pages</value>
+ </prop>
+</node>
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index 8c32ea3..8557991 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
abw \
boost_headers \
ebook \
+ etonyek \
icui18n \
icuuc \
libxml2 \
@@ -67,6 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/EBookImportFilter \
writerperfect/source/writer/MSWorksImportFilter \
writerperfect/source/writer/MWAWImportFilter \
+ writerperfect/source/writer/PagesImportFilter \
writerperfect/source/writer/WordPerfectImportFilter \
writerperfect/source/writer/wpftwriter_genericfilter \
))
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 904daab..f8f9f85 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -35,6 +35,7 @@ void WpftWriterFilterTest::test()
doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/");
doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
+ doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/");
doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/");
}
diff --git a/writerperfect/qa/unit/data/writer/libetonyek/fail/.gitignore b/writerperfect/qa/unit/data/writer/libetonyek/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/writer/libetonyek/indeterminate/.gitignore b/writerperfect/qa/unit/data/writer/libetonyek/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_4.pages b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_4.pages
new file mode 100644
index 0000000..43c9213
Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_4.pages differ
diff --git a/writerperfect/source/writer/PagesImportFilter.cxx b/writerperfect/source/writer/PagesImportFilter.cxx
new file mode 100644
index 0000000..3942aa0
--- /dev/null
+++ b/writerperfect/source/writer/PagesImportFilter.cxx
@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* PagesImportFilter: Sets up the filter, and calls DocumentCollector
+ * to do the actual filtering
+ *
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <libetonyek/libetonyek.h>
+
+#include <com/sun/star/uno/Reference.h>
+
+#include <cppuhelper/supportsservice.hxx>
+
+#include "PagesImportFilter.hxx"
+
+using com::sun::star::uno::Sequence;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::Any;
+using com::sun::star::uno::XInterface;
+using com::sun::star::uno::Exception;
+using com::sun::star::uno::RuntimeException;
+using com::sun::star::uno::XComponentContext;
+
+using libetonyek::EtonyekDocument;
+
+bool PagesImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, OdtGenerator &rGenerator, utl::MediaDescriptor &)
+{
+ return EtonyekDocument::parse(&rInput, &rGenerator);
+}
+
+bool PagesImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
+{
+ EtonyekDocument::Type type = EtonyekDocument::TYPE_UNKNOWN;
+ const EtonyekDocument::Confidence confidence = EtonyekDocument::isSupported(&rInput, &type);
+ if ((confidence == EtonyekDocument::CONFIDENCE_EXCELLENT) && (type == EtonyekDocument::TYPE_PAGES))
+ {
+ rTypeName = "writer_ApplePages";
+ return true;
+ }
+
+ return false;
+}
+
+OUString PagesImportFilter_getImplementationName()
+throw (RuntimeException)
+{
+ return OUString("org.libreoffice.comp.Writer.PagesImportFilter");
+}
+
+Sequence< OUString > SAL_CALL PagesImportFilter_getSupportedServiceNames()
+throw (RuntimeException)
+{
+ Sequence < OUString > aRet(2);
+ OUString *pArray = aRet.getArray();
+ pArray[0] = "com.sun.star.document.ImportFilter";
+ pArray[1] = "com.sun.star.document.ExtendedTypeDetection";
+ return aRet;
+}
+
+Reference< XInterface > SAL_CALL PagesImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
+{
+ return static_cast<cppu::OWeakObject *>(new PagesImportFilter(rContext));
+}
+
+// XServiceInfo
+OUString SAL_CALL PagesImportFilter::getImplementationName()
+throw (RuntimeException, std::exception)
+{
+ return PagesImportFilter_getImplementationName();
+}
+sal_Bool SAL_CALL PagesImportFilter::supportsService(const OUString &rServiceName)
+throw (RuntimeException, std::exception)
+{
+ return cppu::supportsService(this, rServiceName);
+}
+Sequence< OUString > SAL_CALL PagesImportFilter::getSupportedServiceNames()
+throw (RuntimeException, std::exception)
+{
+ return PagesImportFilter_getSupportedServiceNames();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/PagesImportFilter.hxx b/writerperfect/source/writer/PagesImportFilter.hxx
new file mode 100644
index 0000000..e527b07
--- /dev/null
+++ b/writerperfect/source/writer/PagesImportFilter.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_PAGESIMPORTFILTER_HXX
+#define INCLUDED_WRITERPERFECT_SOURCE_WRITER_PAGESIMPORTFILTER_HXX
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
+#include "DocumentHandlerForOdt.hxx"
+#include "ImportFilter.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 PagesImportFilter : public writerperfect::ImportFilter<OdtGenerator>
+{
+public:
+ PagesImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::ImportFilter<OdtGenerator>(rxContext) {}
+
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+private:
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, OdtGenerator &rGenerator, utl::MediaDescriptor &rDescriptor) SAL_OVERRIDE;
+};
+
+OUString PagesImportFilter_getImplementationName()
+throw (::com::sun::star::uno::RuntimeException);
+
+::com::sun::star::uno::Sequence< OUString > SAL_CALL PagesImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
+
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+SAL_CALL PagesImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
index 8a204ec..eaf751a 100644
--- a/writerperfect/source/writer/wpftwriter.component
+++ b/writerperfect/source/writer/wpftwriter.component
@@ -38,4 +38,8 @@
<service name="com.sun.star.document.ExtendedTypeDetection"/>
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
+ <implementation name="org.libreoffice.comp.Writer.PagesImportFilter">
+ <service name="com.sun.star.document.ExtendedTypeDetection"/>
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
</component>
diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
index cd60fe2..3f508c4 100644
--- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx
+++ b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
@@ -36,6 +36,7 @@
#include "WordPerfectImportFilter.hxx"
#include "MSWorksImportFilter.hxx"
#include "MWAWImportFilter.hxx"
+#include "PagesImportFilter.hxx"
namespace
{
@@ -67,6 +68,11 @@ static cppu::ImplementationEntry const services[] =
&EBookImportFilter_getSupportedServiceNames,
&cppu::createSingleComponentFactory, 0, 0
},
+ {
+ &PagesImportFilter_createInstance, &PagesImportFilter_getImplementationName,
+ &PagesImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
{ 0, 0, 0, 0, 0, 0 }
};
More information about the Libreoffice-commits
mailing list