diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-11 15:10:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-11 18:04:58 +0200 |
| commit | 6ed0b0230efebe6b3c705e74b8583359ebe4bbe2 (patch) | |
| tree | fd3e152a797281cd4d5101377daa8de7bca69f0c /starmath/source/mathmlimport.cxx | |
| parent | 7fd79956833ed26429f1a55f1fdf0ac50325161d (diff) | |
remove archaic Content.xml fallback
there's no evidence that Content.xml (or Meta.xml) was written by any released
version to necessitate the fallback
reportdesign Settings.xml and Style.xml fallbacks appear to be cargocult
influenced by the Content.xml/Meta.xml examples
Change-Id: I51d138344edaffc6d21e17c2d28047ea6316304e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93970
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
Diffstat (limited to 'starmath/source/mathmlimport.cxx')
| -rw-r--r-- | starmath/source/mathmlimport.cxx | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index e0dab47598b9..6ae00afbb92e 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -195,7 +195,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium &rMedium) xStatusIndicator->setValue(nSteps++); auto nWarn = ReadThroughComponent( - rMedium.GetStorage(), xModelComp, "meta.xml", "Meta.xml", + rMedium.GetStorage(), xModelComp, "meta.xml", xContext, xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaImporter" : "com.sun.star.comp.Math.XMLMetaImporter") ); @@ -206,7 +206,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium &rMedium) xStatusIndicator->setValue(nSteps++); nWarn = ReadThroughComponent( - rMedium.GetStorage(), xModelComp, "settings.xml", nullptr, + rMedium.GetStorage(), xModelComp, "settings.xml", xContext, xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisSettingsImporter" : "com.sun.star.comp.Math.XMLSettingsImporter" ) ); @@ -217,7 +217,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium &rMedium) xStatusIndicator->setValue(nSteps++); nError = ReadThroughComponent( - rMedium.GetStorage(), xModelComp, "content.xml", "Content.xml", + rMedium.GetStorage(), xModelComp, "content.xml", xContext, xInfoSet, "com.sun.star.comp.Math.XMLImporter" ); } else @@ -351,7 +351,6 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent( const uno::Reference< embed::XStorage >& xStorage, const Reference<XComponent>& xModelComponent, const char* pStreamName, - const char* pCompatibilityStreamName, Reference<uno::XComponentContext> const & rxContext, Reference<beans::XPropertySet> const & rPropSet, const char* pFilterName ) @@ -361,13 +360,6 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent( // open stream (and set parser input) OUString sStreamName = OUString::createFromAscii(pStreamName); - if ( !xStorage->hasByName(sStreamName) || !xStorage->isStreamElement(sStreamName) ) - { - // stream name not found! Then try the compatibility name. - // do we even have an alternative name? - if ( pCompatibilityStreamName ) - sStreamName = OUString::createFromAscii(pCompatibilityStreamName); - } // get input stream try |