strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#151842: Revert "Connect new import / export to starmath"

Browse source 
Will create a unittest in a follow-up commit

This reverts commit 9b7600f547.

Change-Id: I10b28c3ae15f60da41a16136f3969ed6917d8a93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143534
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli 2022-12-01 16:30:28 +01:00
parent 9c6fa5fc98
commit 9939ffb9b8
2 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
starmath/source/document.cxx
View file

@ -70,8 +70,8 @@
#include "ooxmlexport.hxx" #include "ooxmlexport.hxx"
#include "ooxmlimport.hxx" #include "ooxmlimport.hxx"
#include "rtfexport.hxx" #include "rtfexport.hxx"
#include <import.hxx> #include <mathmlimport.hxx>
#include <export.hxx> #include <mathmlexport.hxx>
#include <svx/svxids.hrc> #include <svx/svxids.hrc>
#include <cursor.hxx> #include <cursor.hxx>
#include <comphelper/diagnose_ex.hxx> #include <comphelper/diagnose_ex.hxx>
@ -596,7 +596,8 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium)
InvalidateCursor(); InvalidateCursor();
} }
Reference<css::frame::XModel> xModel(GetModel()); Reference<css::frame::XModel> xModel(GetModel());
SmMLImportWrapper aEquation(xModel); SmXMLImportWrapper aEquation(xModel);
aEquation.useHTMLMLEntities(true);
bSuccess = ( ERRCODE_NONE == aEquation.Import(rMedium) ); bSuccess = ( ERRCODE_NONE == aEquation.Import(rMedium) );
} }
else else
@ -656,7 +657,7 @@ bool SmDocShell::Load( SfxMedium& rMedium )
{ {
// is this a fabulous math package ? // is this a fabulous math package ?
Reference<css::frame::XModel> xModel(GetModel()); Reference<css::frame::XModel> xModel(GetModel());
SmMLImportWrapper aEquation(xModel); SmXMLImportWrapper aEquation(xModel);
auto nError = aEquation.Import(rMedium); auto nError = aEquation.Import(rMedium);
bRet = ERRCODE_NONE == nError; bRet = ERRCODE_NONE == nError;
SetError(nError); SetError(nError);
@ -687,8 +688,8 @@ bool SmDocShell::Save()
ArrangeFormula(); ArrangeFormula();
Reference<css::frame::XModel> xModel(GetModel()); Reference<css::frame::XModel> xModel(GetModel());
SmMLExportWrapper aEquation(xModel); SmXMLExportWrapper aEquation(xModel);
aEquation.setFlat(false); aEquation.SetFlat(false);
return aEquation.Export(*GetMedium()); return aEquation.Export(*GetMedium());
} }
@ -747,8 +748,8 @@ bool SmDocShell::SaveAs( SfxMedium& rMedium )
ArrangeFormula(); ArrangeFormula();
Reference<css::frame::XModel> xModel(GetModel()); Reference<css::frame::XModel> xModel(GetModel());
SmMLExportWrapper aEquation(xModel); SmXMLExportWrapper aEquation(xModel);
aEquation.setFlat(false); aEquation.SetFlat(false);
bRet = aEquation.Export(rMedium); bRet = aEquation.Export(rMedium);
} }
return bRet; return bRet;
@ -769,16 +770,16 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
if(rFltName == STAROFFICE_XML) if(rFltName == STAROFFICE_XML)
{ {
Reference<css::frame::XModel> xModel(GetModel()); Reference<css::frame::XModel> xModel(GetModel());
SmMLExportWrapper aEquation(xModel); SmXMLExportWrapper aEquation(xModel);
aEquation.setFlat(false); aEquation.SetFlat(false);
bRet = aEquation.Export(rMedium); bRet = aEquation.Export(rMedium);
} }
else if(rFltName == MATHML_XML) else if(rFltName == MATHML_XML)
{ {
Reference<css::frame::XModel> xModel(GetModel()); Reference<css::frame::XModel> xModel(GetModel());
SmMLExportWrapper aEquation(xModel); SmXMLExportWrapper aEquation(xModel);
aEquation.setFlat(true); aEquation.SetFlat(true);
aEquation.setUseHTMLMLEntities(true); aEquation.SetUseHTMLMLEntities(true);
bRet = aEquation.Export(rMedium); bRet = aEquation.Export(rMedium);
} }
else if (pFlt->GetFilterName() == "MathType 3.x") else if (pFlt->GetFilterName() == "MathType 3.x")

24
starmath/util/sm.component
View file

@ -67,28 +67,4 @@
constructor="org_libreoffice_comp_Math_sidebar_SmPanelFactory"> constructor="org_libreoffice_comp_Math_sidebar_SmPanelFactory">
<service name="com.sun.star.ui.UIElementFactory"/> <service name="com.sun.star.ui.UIElementFactory"/>
</implementation> </implementation>
<implementation name="com.sun.star.comp.Math.MLImporter"
constructor="Math_MLImporter_get_implementation">
<service name="com.sun.star.xml.MLImportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.MLOasisMetaImporter"
constructor="Math_MLOasisMetaImporter_get_implementation">
<service name="com.sun.star.xml.MLImportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.MLOasisSettingsImporter"
constructor="Math_MLOasisSettingsImporter_get_implementation">
<service name="com.sun.star.xml.MLImportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.MLContentExporter"
constructor="Math_MLContentExporter_get_implementation">
<service name="com.sun.star.xml.MLExportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.MLOasisMetaExporter"
constructor="Math_MLOasisMetaExporter_get_implementation">
<service name="com.sun.star.xml.MLExportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.MLOasisSettingsExporter"
constructor="Math_MLOasisSettingsExporter_get_implementation">
<service name="com.sun.star.xml.MLExportFilter"/>
</implementation>
</component> </component>