diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 9 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index cc93f6f38c37..f5bec6a0867a 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -105,7 +105,6 @@ rtl::Reference<FuPoor> FuInsertGraphic::Create( ViewShell* pViewSh, ::sd::Window void FuInsertGraphic::DoExecute( SfxRequest& rReq ) { OUString aFileName; - OUString aFilterName; Graphic aGraphic; bool bAsLink = false; @@ -119,6 +118,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) { 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(); @@ -137,7 +137,6 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) nError = aDlg.GetGraphic(aGraphic); bAsLink = aDlg.IsAsLink(); aFileName = aDlg.GetPath(); - aFilterName = aDlg.GetDetectedFilter(); } if( nError == ERRCODE_NONE ) @@ -185,11 +184,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) } // store as link - OUString aReferer; - if (mpDocSh->HasName()) { - aReferer = mpDocSh->GetMedium()->GetName(); - } - pGrafObj->SetGraphicLink(aFileName, aReferer, aFilterName); + pGrafObj->SetGraphicLink(aFileName); } } } diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index c1305607db13..882258bd9231 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -427,7 +427,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) SdrGrafObj* pGrafObj = InsertGraphic( aGraphic, nTempAction, maDropPos, nullptr, nullptr ); if(pGrafObj && bLink) { - pGrafObj->SetGraphicLink( aCurrentDropFile, u""/*TODO?*/, OUString() ); + pGrafObj->SetGraphicLink( aCurrentDropFile ); } // return action from first inserted graphic |