sd/source/ui/func/fuinsert.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit dc9ec9f359ddc91a3aedbe38e6079b0555fb03f9 Author: Henry Castro <[email protected]> Date: Tue Feb 16 19:05:47 2016 -0400 tdf#97719: Canceling insert image dialog gives error dialog Change-Id: I3ac9b0fe4d5a91d16af559ee8e38bc7be97cc694 Reviewed-on: https://gerrit.libreoffice.org/22408 Tested-by: Jenkins <[email protected]> Reviewed-by: Henry Castro <[email protected]> diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index f9cd4c9..b35a43f 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -139,13 +139,13 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) { SvxOpenGraphicDialog aDlg(SdResId(STR_INSERTGRAPHIC)); - if( aDlg.Execute() == GRFILTER_OK ) - { - nError = aDlg.GetGraphic(aGraphic); - bAsLink = aDlg.IsAsLink(); - aFileName = aDlg.GetPath(); - aFilterName = aDlg.GetCurrentFilter(); - } + if( aDlg.Execute() != GRFILTER_OK ) + return; // cancel dialog + + nError = aDlg.GetGraphic(aGraphic); + bAsLink = aDlg.IsAsLink(); + aFileName = aDlg.GetPath(); + aFilterName = aDlg.GetCurrentFilter(); } if( nError == GRFILTER_OK ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
