diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-10 01:24:23 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-10 01:26:17 +0200 |
| commit | 2db1e3447298f2b25287ff6ad4c5dda1e675f5e3 (patch) | |
| tree | 741076eacfb6692f350f4bc4d4e5d57e48e53165 /sc | |
| parent | f1e6e9e7ff739993f8a92cf268112f8be9769cbc (diff) | |
fix gnumeric import
Change-Id: I65e4d4df9b75304096ec51e07f5985023ad3071c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/orcus/filterdetect.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 8 | ||||
| -rw-r--r-- | sc/util/scfilt.component | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index 8c84a5d99cd4..7273df5759ca 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -102,7 +102,7 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue> } extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_oox_sc_OrcusFormatDetect_get_implementation(::com::sun::star::uno::XComponentContext* , +com_sun_star_comp_sc_OrcusFormatDetect_get_implementation(::com::sun::star::uno::XComponentContext* , ::com::sun::star::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new OrcusFormatDetect()); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index b3fd054626bc..524bd341d15d 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1153,6 +1153,14 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) else bRet = true; } + else if (aFltName == "Gnumeric Spreadsheet") + { + ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters(); + if (!pOrcus) + return false; + + bRet = pOrcus->importGnumeric(aDocument, rMedium); + } else if (aFltName == pFilterAscii) { SfxItemSet* pSet = rMedium.GetItemSet(); diff --git a/sc/util/scfilt.component b/sc/util/scfilt.component index 0df939fcfd23..5528935356d1 100644 --- a/sc/util/scfilt.component +++ b/sc/util/scfilt.component @@ -28,7 +28,7 @@ constructor="com_sun_star_comp_oox_xls_FormulaParser_get_implementation"> <service name="com.sun.star.sheet.FilterFormulaParser"/> </implementation> - <implementation name="com.sun.star.comp.sc.OrcusFormatDetect" + <implementation name="com.sun.star.comp.sc.OrcusFilterDetect" constructor="com_sun_star_comp_sc_OrcusFormatDetect_get_implementation"> <service name="com.sun.star.frame.ExtendedTypeDetection"/> </implementation> |