diff options
| -rw-r--r-- | filter/source/config/fragments/filters/calc_Gnumeric.xcu | 2 | ||||
| -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 |
4 files changed, 11 insertions, 3 deletions
diff --git a/filter/source/config/fragments/filters/calc_Gnumeric.xcu b/filter/source/config/fragments/filters/calc_Gnumeric.xcu index 421061516c80..cc350fd62f50 100644 --- a/filter/source/config/fragments/filters/calc_Gnumeric.xcu +++ b/filter/source/config/fragments/filters/calc_Gnumeric.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Gnumeric Spreadsheet" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> 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> |