diff options
| author | Henry Castro <hcastro@collabora.com> | 2016-02-16 19:05:47 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2016-02-17 00:33:19 +0000 |
| commit | dc9ec9f359ddc91a3aedbe38e6079b0555fb03f9 (patch) | |
| tree | 0b5479d9dc599446deeef4baded7ac129f8000ce | |
| parent | df8b1dca993d1c0d2b6d5fbfaf4741ffc4cb263b (diff) | |
tdf#97719: Canceling insert image dialog gives error dialog
Change-Id: I3ac9b0fe4d5a91d16af559ee8e38bc7be97cc694
Reviewed-on: https://gerrit.libreoffice.org/22408
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index f9cd4c95f74b..b35a43f6af29 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 ) |