summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/sdrundomanager.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx12
-rw-r--r--svx/source/svdraw/svdetc.cxx16
-rw-r--r--svx/source/svdraw/svdobj.cxx8
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx12
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx2
-rw-r--r--svx/source/svdraw/svdoutlinercache.cxx4
7 files changed, 28 insertions, 28 deletions
diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx
index ecb55c8dea68..adec049b539f 100644
--- a/svx/source/svdraw/sdrundomanager.cxx
+++ b/svx/source/svdraw/sdrundomanager.cxx
@@ -100,7 +100,7 @@ void SdrUndoManager::Clear()
}
}
-void SdrUndoManager::SetEndTextEditHdl(const Link& rLink)
+void SdrUndoManager::SetEndTextEditHdl(const Link<>& rLink)
{
maEndTextEditHdl = rLink;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 0d4ee090e7d6..4899c4b97947 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -505,7 +505,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
}
}
Outliner& rDrawOutl=pMod->GetDrawOutliner(pTextObj);
- Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
+ Link<> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
if (!bOk && aDrawOutlLink.IsSet()) {
aDrawOutlLink.Call(pFI);
bOk = !rStr.isEmpty();
@@ -774,8 +774,8 @@ bool SdrObjEditView::SdrBeginTextEdit(
else
{
pTextEditOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
- pTextEditOutliner->SetBeginPasteOrDropHdl(Link());
- pTextEditOutliner->SetEndPasteOrDropHdl(Link());
+ pTextEditOutliner->SetBeginPasteOrDropHdl(Link<>());
+ pTextEditOutliner->SetEndPasteOrDropHdl(Link<>());
}
}
if (pTextEditOutliner != NULL)
@@ -856,7 +856,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
// reset the callback link and let the undo manager cleanup all text edit
// undo actions to get the stack back to the form before the text edit
- pSdrUndoManager->SetEndTextEditHdl(Link());
+ pSdrUndoManager->SetEndTextEditHdl(Link<>());
}
else
{
@@ -907,8 +907,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
// Set old CalcFieldValue-Handler again, this
// has to happen before Obj::EndTextEdit(), as this does UpdateFields().
pTEOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
- pTEOutliner->SetBeginPasteOrDropHdl(Link());
- pTEOutliner->SetEndPasteOrDropHdl(Link());
+ pTEOutliner->SetBeginPasteOrDropHdl(Link<>());
+ pTEOutliner->SetEndPasteOrDropHdl(Link<>());
const bool bUndo = IsUndoEnabled();
if( bUndo )
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index b5577781ad69..4afabbe9b7d8 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -97,7 +97,7 @@ OLEObjCache::OLEObjCache()
{
nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
pTimer = new AutoTimer();
- Link aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
+ Link<> aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
pTimer->SetTimeoutHdl(aLink);
pTimer->SetTimeout(20000);
@@ -251,7 +251,7 @@ void SdrLinkList::Clear()
aList.clear();
}
-unsigned SdrLinkList::FindEntry(const Link& rLink) const
+unsigned SdrLinkList::FindEntry(const Link<>& rLink) const
{
unsigned nAnz=GetLinkCount();
for (unsigned i=0; i<nAnz; i++) {
@@ -260,15 +260,15 @@ unsigned SdrLinkList::FindEntry(const Link& rLink) const
return 0xFFFF;
}
-void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos)
+void SdrLinkList::InsertLink(const Link<>& rLink, unsigned nPos)
{
unsigned nFnd=FindEntry(rLink);
if (nFnd==0xFFFF) {
if (rLink.IsSet()) {
if(nPos==0xFFFF)
- aList.push_back(new Link(rLink));
+ aList.push_back(new Link<>(rLink));
else
- aList.insert(aList.begin() + nPos, new Link(rLink));
+ aList.insert(aList.begin() + nPos, new Link<>(rLink));
} else {
OSL_FAIL("SdrLinkList::InsertLink(): Tried to insert a link that was not set already.");
}
@@ -277,11 +277,11 @@ void SdrLinkList::InsertLink(const Link& rLink, unsigned nPos)
}
}
-void SdrLinkList::RemoveLink(const Link& rLink)
+void SdrLinkList::RemoveLink(const Link<>& rLink)
{
unsigned nFnd=FindEntry(rLink);
if (nFnd!=0xFFFF) {
- Link* pLink = aList[nFnd];
+ Link<>* pLink = aList[nFnd];
aList.erase( aList.begin() + nFnd );
delete pLink;
} else {
@@ -545,7 +545,7 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange
-SvdProgressInfo::SvdProgressInfo( Link *_pLink )
+SvdProgressInfo::SvdProgressInfo( Link<> *_pLink )
{
DBG_ASSERT(_pLink!=NULL,"SvdProgressInfo(): No Link stated!");
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8afbb4f969a4..edea77372da3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -3336,25 +3336,25 @@ SdrObject* SdrObjFactory::MakeNewObject(
return pObj;
}
-void SdrObjFactory::InsertMakeObjectHdl(const Link& rLink)
+void SdrObjFactory::InsertMakeObjectHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjHdl();
rLL.InsertLink(rLink);
}
-void SdrObjFactory::RemoveMakeObjectHdl(const Link& rLink)
+void SdrObjFactory::RemoveMakeObjectHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjHdl();
rLL.RemoveLink(rLink);
}
-void SdrObjFactory::InsertMakeUserDataHdl(const Link& rLink)
+void SdrObjFactory::InsertMakeUserDataHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl();
rLL.InsertLink(rLink);
}
-void SdrObjFactory::RemoveMakeUserDataHdl(const Link& rLink)
+void SdrObjFactory::RemoveMakeUserDataHdl(const Link<>& rLink)
{
SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl();
rLL.RemoveLink(rLink);
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 84ef3242fd46..71b4f7e7c649 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -126,8 +126,8 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeContourTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeContourBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link());
- mrOutliner.SetDrawBulletHdl(Link());
+ mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawBulletHdl(Link<>());
}
void decomposeBlockTextPrimitive(
@@ -141,8 +141,8 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeBlockTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeBlockBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link());
- mrOutliner.SetDrawBulletHdl(Link());
+ mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawBulletHdl(Link<>());
}
void decomposeStretchTextPrimitive(const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix& rNewTransformB)
@@ -152,8 +152,8 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeStretchTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeStretchBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link());
- mrOutliner.SetDrawBulletHdl(Link());
+ mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawBulletHdl(Link<>());
}
drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence();
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 6d053e47ddb3..252d39ab0558 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -791,7 +791,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
}
// clean up outliner
- rOutliner.SetDrawPortionHdl(Link());
+ rOutliner.SetDrawPortionHdl(Link<>());
rOutliner.Clear();
rOutliner.setVisualizedPage(0);
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index 3c733ef96ed7..c715a4dbb765 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -82,7 +82,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
pOutliner->SetVertical( false );
// Deregister on outliner, might be reused from outliner cache
- pOutliner->SetNotifyHdl( Link() );
+ pOutliner->SetNotifyHdl( Link<>() );
}
else if( (OUTLINERMODE_TEXTOBJECT == nOutlMode) && (NULL == mpModeText) )
{
@@ -91,7 +91,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
pOutliner->SetVertical( false );
// Deregister on outliner, might be reused from outliner cache
- pOutliner->SetNotifyHdl( Link() );
+ pOutliner->SetNotifyHdl( Link<>() );
}
else
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 08:04:25 +0000