[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sd/source
Henry Castro
hcastro at collabora.com
Thu Feb 18 00:16:11 UTC 2016
sd/source/ui/func/fuinsert.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 6eec9807349494c54decfdd22bc2d36e70dfea2f
Author: Henry Castro <hcastro at collabora.com>
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 <ci at libreoffice.org>
Reviewed-by: Henry Castro <hcastro at collabora.com>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 81a0874..e1c697c 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -142,13 +142,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 )
More information about the Libreoffice-commits
mailing list