enable Apple Numbers import

Change-Id: I9aaa4ae2e567b54f15097c265a3d1c3c12662b92
(cherry picked from commit a1202971)

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',

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

filter/source/config/fragments/filters/AppleNumbers.xcu

+<!--
+ * 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>

filter/source/config/fragments/types/calc_AppleNumbers.xcu

+<!--
+ * 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>

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 \
 ))
 

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);

writerperfect/source/calc/NumbersImportFilter.cxx

+/* -*- 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: */

writerperfect/source/calc/NumbersImportFilter.hxx

+/* -*- 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: */

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>

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 }
 };