sd/source/ui/func/fupage.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
New commits: commit 8304c671b19365e61d88a9133631775846a172a5 Author: Aron Budea <aron.bu...@collabora.com> AuthorDate: Sun Dec 22 08:10:25 2019 +0100 Commit: Ashod Nakashian <ashnak...@gmail.com> CommitDate: Sun Dec 22 16:18:07 2019 +0100 tdf#128449 Set graphic when setting background in Impress Regression from 905e6bd3ae0ca5c5ac7083430d7aa126c6526fd7 Change-Id: If0510967a339b6b46da2b7f798f478a46bd10b48 Reviewed-on: https://gerrit.libreoffice.org/85688 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 7c2654e0bba0..95dc91b232f2 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -293,8 +293,6 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& } else if (nId == SID_SELECT_BACKGROUND) { - OUString aFileName; - OUString aFilterName; Graphic aGraphic; ErrCode nError = ERRCODE_GRFILTER_OPENERROR; @@ -303,7 +301,8 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (pArgs && pArgs->GetItemState(SID_SELECT_BACKGROUND, true, &pItem) == SfxItemState::SET) { - aFileName = static_cast<const SfxStringItem*>(pItem)->GetValue(); + OUString aFileName(static_cast<const SfxStringItem*>(pItem)->GetValue()); + OUString aFilterName; if (pArgs->GetItemState(FN_PARAM_FILTER, true, &pItem) == SfxItemState::SET) aFilterName = static_cast<const SfxStringItem*>(pItem)->GetValue(); @@ -316,11 +315,9 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE), pParent); nError = aDlg.Execute(); - if (nError != ERRCODE_NONE) + if (nError == ERRCODE_NONE) { nError = aDlg.GetGraphic(aGraphic); - aFileName = aDlg.GetPath(); - aFilterName = aDlg.GetDetectedFilter(); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits