Kaydet (Commit) cf56b5d4 authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) jan iversen

cppcheck: silence known condition warning svx xmlexport

Change-Id: If2dcb406d7bd1be8f5552ba75b6cabdbb6c97cb5
Reviewed-on: https://gerrit.libreoffice.org/24208Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
üst 1be6c440
...@@ -150,7 +150,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr ...@@ -150,7 +150,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream, const Reference< lang::XComponent >& xComponent, const char* pImportService ) bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream, const Reference< lang::XComponent >& xComponent, const char* pImportService )
{ {
sal_uInt32 nRet = 0; bool bRet = true;
Reference< document::XGraphicObjectResolver > xGraphicResolver; Reference< document::XGraphicObjectResolver > xGraphicResolver;
SvXMLGraphicHelper *pGraphicHelper = nullptr; SvXMLGraphicHelper *pGraphicHelper = nullptr;
...@@ -188,10 +188,6 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr ...@@ -188,10 +188,6 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
xObjectResolver = pObjectHelper; xObjectResolver = pObjectHelper;
} }
if( 0 == nRet )
{
// parse // parse
// prepare ParserInputSrouce // prepare ParserInputSrouce
xml::sax::InputSource aParserInput; xml::sax::InputSource aParserInput;
...@@ -210,7 +206,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr ...@@ -210,7 +206,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
Reference< xml::sax::XDocumentHandler > xFilter( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( OUString::createFromAscii( pImportService ), aFilterArgs, xContext), UNO_QUERY ); Reference< xml::sax::XDocumentHandler > xFilter( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( OUString::createFromAscii( pImportService ), aFilterArgs, xContext), UNO_QUERY );
DBG_ASSERT( xFilter.is(), "Can't instantiate filter component." ); DBG_ASSERT( xFilter.is(), "Can't instantiate filter component." );
nRet = 1; bRet = false;
if( xParser.is() && xFilter.is() ) if( xParser.is() && xFilter.is() )
{ {
// connect parser and filter // connect parser and filter
...@@ -223,8 +219,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr ...@@ -223,8 +219,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
// finally, parser the stream // finally, parser the stream
xParser->parseStream( aParserInput ); xParser->parseStream( aParserInput );
nRet = 0; bRet = true;
}
} }
} }
catch( uno::Exception& ) catch( uno::Exception& )
...@@ -243,7 +238,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr ...@@ -243,7 +238,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
if ( xTargetModel.is() ) if ( xTargetModel.is() )
xTargetModel->unlockControllers(); xTargetModel->unlockControllers();
return nRet == 0; return bRet;
} }
bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream ) bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream )
......
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