diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-23 02:35:25 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-24 23:39:56 +0200 |
commit | 96475ada3fcf026ae7833824a056b642c1bd1864 (patch) | |
tree | 1742f4df04b0dcb8c35c31ea8316ef3aaa9b732d /sc | |
parent | a85317c67f870917231e82eb29fd5023e55b87de (diff) |
orcus autofilter import, implement the interface
only empty stubs for now
Change-Id: I44ed24fbd4d67a0f440202117a980c7d349016b9
Diffstat (limited to 'sc')
-rw-r--r-- | sc/Module_sc.mk | 7 | ||||
-rw-r--r-- | sc/source/filter/inc/orcusinterface.hxx | 24 | ||||
-rw-r--r-- | sc/source/filter/orcus/interface.cxx | 33 |
3 files changed, 56 insertions, 8 deletions
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index fae40f5bf622..278701cb6c45 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -22,12 +22,6 @@ $(eval $(call gb_Module_add_l10n_targets,sc,\ UIConfig_scalc \ )) -ifneq (,$(ENABLE_OPENCL)) -$(eval $(call gb_Module_add_targets,sc,\ - Library_scopencl \ -)) -endif - ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,sc,\ Library_scqahelper \ @@ -59,7 +53,6 @@ $(eval $(call gb_Module_add_check_targets,sc,\ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ - CppunitTest_sc_opencl_test \ )) # Disabled to allow the check tinderbox execute the sd tests diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index aba1f6d214fb..144629463a3c 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -71,12 +71,34 @@ public: virtual size_t commit_segments() SAL_OVERRIDE; }; +class ScOrcusAutoFilter : public orcus::spreadsheet::iface::import_auto_filter +{ +public: + ScOrcusAutoFilter(ScDocument& rDoc); + + virtual ~ScOrcusAutoFilter(); + + virtual void set_range(const char* p_ref, size_t n_ref); + + virtual void set_column(orcus::spreadsheet::col_t col); + + virtual void append_column_match_value(const char* p, size_t n); + + virtual void commit_column(); + + virtual void commit(); + +private: + ScDocument& mrDoc; +}; + class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet { ScDocumentImport& mrDoc; SCTAB mnTab; ScOrcusFactory& mrFactory; sc::SharedFormulaGroups maFormulaGroups; + ScOrcusAutoFilter maAutoFilter; typedef std::map<size_t, ScRangeData*> SharedFormulaContainer; SharedFormulaContainer maSharedFormulas; @@ -88,6 +110,8 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet public: ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory); + virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() { return &maAutoFilter; } + // Orcus import interface virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 085a2d624592..8bd650ef64cd 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -192,7 +192,7 @@ void ScOrcusFactory::setStatusIndicator(const uno::Reference<task::XStatusIndica } ScOrcusSheet::ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory) : - mrDoc(rDoc), mnTab(nTab), mrFactory(rFactory), mnCellCount(0) {} + mrDoc(rDoc), mnTab(nTab), mrFactory(rFactory), maAutoFilter(rDoc.getDoc()), mnCellCount(0) {} void ScOrcusSheet::cellInserted() { @@ -647,5 +647,36 @@ size_t ScOrcusStyles::commit_cell_style() return 0; } +// auto filter import + +ScOrcusAutoFilter::ScOrcusAutoFilter(ScDocument& rDoc): + mrDoc(rDoc) +{ + (void)mrDoc; +} + +ScOrcusAutoFilter::~ScOrcusAutoFilter() +{ +} + +void ScOrcusAutoFilter::set_range(const char* /*p_ref*/, size_t /*n_ref*/) +{ +} + +void ScOrcusAutoFilter::set_column(orcus::spreadsheet::col_t /*col*/) +{ +} + +void ScOrcusAutoFilter::append_column_match_value(const char* /*p*/, size_t /*n*/) +{ +} + +void ScOrcusAutoFilter::commit_column() +{ +} + +void ScOrcusAutoFilter::commit() +{ +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |