Kaydet (Commit) 8abcd0c3 authored tarafından Noel Grandin's avatar Noel Grandin

use tools::SvRef in ImpSdrObjTextLinkUserData

since the field is SvRefBase-derived

Change-Id: Ie84c48daf93e3805b2db240a497a8496779fe750
üst dc337752
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <svx/svdpagv.hxx> #include <svx/svdpagv.hxx>
#include <rtl/ref.hxx>
// forward declarations // forward declarations
...@@ -105,7 +106,7 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData ...@@ -105,7 +106,7 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData
OUString aFileName; // Name des referenzierten Dokuments OUString aFileName; // Name des referenzierten Dokuments
OUString aFilterName; // ggf. ein Filter OUString aFilterName; // ggf. ein Filter
DateTime aFileDate0; // Unnoetiges neuladen vermeiden DateTime aFileDate0; // Unnoetiges neuladen vermeiden
std::unique_ptr<ImpSdrObjTextLink> tools::SvRef<ImpSdrObjTextLink>
pLink; pLink;
rtl_TextEncoding eCharSet; rtl_TextEncoding eCharSet;
......
...@@ -257,7 +257,7 @@ void SdrTextObj::ImpLinkAnmeldung() ...@@ -257,7 +257,7 @@ void SdrTextObj::ImpLinkAnmeldung()
ImpSdrObjTextLinkUserData* pData=GetLinkUserData(); ImpSdrObjTextLinkUserData* pData=GetLinkUserData();
sfx2::LinkManager* pLinkManager=pModel!=nullptr ? pModel->GetLinkManager() : nullptr; sfx2::LinkManager* pLinkManager=pModel!=nullptr ? pModel->GetLinkManager() : nullptr;
if (pLinkManager!=nullptr && pData!=nullptr && pData->pLink==nullptr) { // don't register twice if (pLinkManager!=nullptr && pData!=nullptr && pData->pLink==nullptr) { // don't register twice
pData->pLink.reset( new ImpSdrObjTextLink(this) ); pData->pLink = new ImpSdrObjTextLink(this);
pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName, pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName,
!pData->aFilterName.isEmpty() ? !pData->aFilterName.isEmpty() ?
&pData->aFilterName : nullptr); &pData->aFilterName : nullptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment