Kaydet (Commit) 2db1e344 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix gnumeric import

Change-Id: I65e4d4df9b75304096ec51e07f5985023ad3071c
üst f1e6e9e7
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--> -->
<node oor:name="Gnumeric Spreadsheet" oor:op="replace"> <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="UIComponent"/>
<prop oor:name="FilterService"/> <prop oor:name="FilterService"/>
<prop oor:name="UserData"/> <prop oor:name="UserData"/>
......
...@@ -102,7 +102,7 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue> ...@@ -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 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 &) ::com::sun::star::uno::Sequence<css::uno::Any> const &)
{ {
return cppu::acquire(new OrcusFormatDetect()); return cppu::acquire(new OrcusFormatDetect());
......
...@@ -1153,6 +1153,14 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) ...@@ -1153,6 +1153,14 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
else else
bRet = true; 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) else if (aFltName == pFilterAscii)
{ {
SfxItemSet* pSet = rMedium.GetItemSet(); SfxItemSet* pSet = rMedium.GetItemSet();
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
constructor="com_sun_star_comp_oox_xls_FormulaParser_get_implementation"> constructor="com_sun_star_comp_oox_xls_FormulaParser_get_implementation">
<service name="com.sun.star.sheet.FilterFormulaParser"/> <service name="com.sun.star.sheet.FilterFormulaParser"/>
</implementation> </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"> constructor="com_sun_star_comp_sc_OrcusFormatDetect_get_implementation">
<service name="com.sun.star.frame.ExtendedTypeDetection"/> <service name="com.sun.star.frame.ExtendedTypeDetection"/>
</implementation> </implementation>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment