diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-08-08 16:23:07 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-11-03 13:57:00 +0100 |
| commit | bd3c5c4c234e3dc6b89cd235321945a41a08d562 (patch) | |
| tree | 8592e2a2088f7c46877aa746695a257bc3877fae /svtools | |
| parent | c4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5 (diff) | |
[API CHANGE] tdf#65393 Import signature line images from ooxml
showing whether the signature behind the signature line is valid or not.
Change-Id: Ia6cca62812019f26d55d234cac767a9b4b7c8175
Reviewed-on: https://gerrit.libreoffice.org/40980
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/provider.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index de7a2dff928c..b70fd5ef4a4e 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -47,6 +47,7 @@ #include <vcl/dibtools.hxx> #include <comphelper/sequence.hxx> #include <memory> +#include <svtools/ehdl.hxx> using namespace com::sun::star; @@ -418,8 +419,9 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co if ( nExtMapMode > 0 ) pExtHeader = &aExtHeader; - if( ( rFilter.ImportGraphic( aVCLGraphic, aPath, *pIStm, - GRFILTER_FORMAT_DONTKNOW, nullptr, GraphicFilterImportFlags::NONE, pExtHeader ) == ERRCODE_NONE ) && + ErrCode error = rFilter.ImportGraphic( aVCLGraphic, aPath, *pIStm, + GRFILTER_FORMAT_DONTKNOW, nullptr, GraphicFilterImportFlags::NONE, pExtHeader ); + if( (error == ERRCODE_NONE ) && ( aVCLGraphic.GetType() != GraphicType::NONE ) ) { ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; @@ -427,6 +429,9 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co pUnoGraphic->init( aVCLGraphic ); xRet = pUnoGraphic; } + else{ + SAL_WARN("svtools", "Could not create graphic: " << error); + } } } |