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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 4f32ed1aa403..311bbcbff367 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -180,7 +180,6 @@ static ErrCode ReadThroughComponent( const uno::Reference< embed::XStorage >& xStorage, const uno::Reference<XComponent>& xModelComponent, const char* pStreamName, - const char* pCompatibilityStreamName, const uno::Reference<XComponentContext> & rxContext, const Reference<document::XGraphicStorageHandler> & rxGraphicStorageHandler, const Reference<document::XEmbeddedObjectResolver>& _xEmbeddedObjectResolver, @@ -200,17 +199,8 @@ static ErrCode ReadThroughComponent( OUString sStreamName = OUString::createFromAscii(pStreamName); if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) ) { - // stream name not found! Then try the compatibility name. - // if no stream can be opened, return immediately with OK signal - - // do we even have an alternative name? - if ( nullptr == pCompatibilityStreamName ) - return ERRCODE_NONE; - - // if so, does the stream exist? - sStreamName = OUString::createFromAscii(pCompatibilityStreamName); - if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) ) - return ERRCODE_NONE; + // stream name not found! return immediately with OK signal + return ERRCODE_NONE; } // get input stream @@ -488,7 +478,6 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) ErrCode nRet = ReadThroughComponent( xStorage ,xModel ,"meta.xml" - ,"Meta.xml" ,GetComponentContext() ,xGraphicStorageHandler ,xEmbeddedObjectResolver @@ -512,7 +501,6 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) nRet = ReadThroughComponent( xStorage ,xModel ,"settings.xml" - ,"Settings.xml" ,GetComponentContext() ,xGraphicStorageHandler ,xEmbeddedObjectResolver @@ -526,7 +514,6 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) nRet = ReadThroughComponent(xStorage ,xModel ,"styles.xml" - ,"Styles.xml" ,GetComponentContext() ,xGraphicStorageHandler ,xEmbeddedObjectResolver @@ -540,7 +527,6 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) nRet = ReadThroughComponent( xStorage ,xModel ,"content.xml" - ,"Content.xml" ,GetComponentContext() ,xGraphicStorageHandler ,xEmbeddedObjectResolver |