[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source

[Aron Budea (via logerrit)]

 sd/source/ui/func/fupage.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 52a1cadbdf82ddc7a8ef550627e59d5f8f15c195
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Sun Dec 22 08:10:25 2019 +0100
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Sun Dec 22 22:10:37 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 <ashnakash at gmail.com>
    (cherry picked from commit 8304c671b19365e61d88a9133631775846a172a5)
    Reviewed-on: https://gerrit.libreoffice.org/85705
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 15a8c5156cee..88c4449a0fde 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -303,8 +303,6 @@ const SfxItemSet* FuPage::ExecuteDialog(vcl::Window* pParent, SfxRequest& rReq)
     }
     else if (nId == SID_SELECT_BACKGROUND)
     {
-        OUString aFileName;
-        OUString aFilterName;
         Graphic aGraphic;
         ErrCode nError = ERRCODE_GRFILTER_OPENERROR;
 
@@ -313,7 +311,8 @@ const SfxItemSet* FuPage::ExecuteDialog(vcl::Window* pParent, SfxRequest& rReq)
 
         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();
@@ -326,11 +325,9 @@ const SfxItemSet* FuPage::ExecuteDialog(vcl::Window* pParent, SfxRequest& rReq)
             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();
             }
         }