summaryrefslogtreecommitdiff
path: root/sd/source/ui/func/fupage.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/func/fupage.cxx')
-rw-r--r--sd/source/ui/func/fupage.cxx9
1 files changed, 3 insertions, 6 deletions
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();
}
}