summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/tpline.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx8
-rw-r--r--editeng/source/items/numitem.cxx3
-rw-r--r--include/editeng/brushitem.hxx2
-rw-r--r--include/editeng/outliner.hxx6
-rw-r--r--sd/source/ui/view/outlview.cxx2
-rw-r--r--svx/source/svdraw/svdotextdecomposition.cxx30
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx7
-rw-r--r--sw/source/core/layout/paintfrm.cxx6
-rw-r--r--sw/source/uibase/docvw/romenu.cxx1
10 files changed, 19 insertions, 48 deletions
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 01940a7b591a..7849d1827d9c 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -315,7 +315,6 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
}
SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH);
- pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
@@ -408,7 +407,6 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
SdrObject::Free(pObj);
SvxBrushItem* pBrushItem = new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH);
- pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 357eb8b6e91f..b0b61af5d94b 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3315,7 +3315,6 @@ public:
GraphicObject* pGraphicObject;
sal_Int8 nGraphicTransparency; //contains a percentage value which is
//copied to the GraphicObject when necessary
- Link<> aDoneLink;
SvStream* pStream;
SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {}
@@ -3323,13 +3322,6 @@ public:
-void SvxBrushItem::SetDoneLink( const Link<>& rLink )
-{
- pImpl->aDoneLink = rLink;
-}
-
-
-
SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich ),
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index c25121471652..0edc0a4e85c7 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -338,7 +338,6 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
if(rFormat.pGraphicBrush)
{
pGraphicBrush = new SvxBrushItem(*rFormat.pGraphicBrush);
- pGraphicBrush->SetDoneLink( LINK( this, SvxNumberFormat, GraphicArrived) );
}
DELETEZ(pBulletFont);
if(rFormat.pBulletFont)
@@ -402,7 +401,6 @@ void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
{
delete pGraphicBrush;
pGraphicBrush = static_cast<SvxBrushItem*>(pBrushItem->Clone());
- pGraphicBrush->SetDoneLink( LINK( this, SvxNumberFormat, GraphicArrived) );
}
if(pOrient)
@@ -422,7 +420,6 @@ void SvxNumberFormat::SetGraphic( const OUString& rName )
delete pGraphicBrush;
pGraphicBrush = new SvxBrushItem( rName, "", GPOS_AREA, 0 );
- pGraphicBrush->SetDoneLink( LINK( this, SvxNumberFormat, GraphicArrived) );
if( eVertOrient == text::VertOrientation::NONE )
eVertOrient = text::VertOrientation::TOP;
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 22a3d4219a87..0c2c26f7d5f3 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -95,8 +95,6 @@ public:
Color& GetColor() { return aColor; }
void SetColor( const Color& rCol) { aColor = rCol; }
- void SetDoneLink( const Link<>& rLink );
-
SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; }
void PurgeMedium() const;
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 5a2dbe9f8cf9..fbe0b367c16b 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -589,7 +589,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
Paragraph* pHdlParagraph;
sal_Int32 mnFirstSelPage;
- Link<> aDrawPortionHdl;
+ Link<DrawPortionInfo*,void> aDrawPortionHdl;
Link<> aDrawBulletHdl;
Link<> aExpandHdl;
Link<> aParaInsertedHdl;
@@ -796,8 +796,8 @@ public:
void SetFieldClickedHdl(const Link<>& rLink ) { aFieldClickedHdl= rLink; }
Link<> GetFieldClickedHdl() const { return aFieldClickedHdl; }
- void SetDrawPortionHdl(const Link<>& rLink){aDrawPortionHdl=rLink;}
- Link<> GetDrawPortionHdl() const { return aDrawPortionHdl; }
+ void SetDrawPortionHdl(const Link<DrawPortionInfo*,void>& rLink){aDrawPortionHdl=rLink;}
+ Link<DrawPortionInfo*,void> GetDrawPortionHdl() const { return aDrawPortionHdl; }
void SetDrawBulletHdl(const Link<>& rLink){aDrawBulletHdl=rLink;}
Link<> GetDrawBulletHdl() const { return aDrawBulletHdl; }
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 59e790cdff6b..bc3c87b1e197 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1382,7 +1382,7 @@ void OutlineView::ResetLinks() const
mrOutliner.SetStatusEventHdl(aEmptyLink);
mrOutliner.SetRemovingPagesHdl(aEmptyLink);
mrOutliner.SetIndentingPagesHdl(aEmptyLink);
- mrOutliner.SetDrawPortionHdl(aEmptyLink);
+ mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetBeginPasteOrDropHdl(aEmptyLink);
mrOutliner.SetEndPasteOrDropHdl(aEmptyLink);
}
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index f10dc9279832..0f2cca449268 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -89,9 +89,9 @@ namespace
// BlockText (see there)
basegfx::B2DRange maClipRange;
- DECL_LINK(decomposeContourTextPrimitive, DrawPortionInfo* );
- DECL_LINK(decomposeBlockTextPrimitive, DrawPortionInfo* );
- DECL_LINK(decomposeStretchTextPrimitive, DrawPortionInfo* );
+ DECL_LINK_TYPED(decomposeContourTextPrimitive, DrawPortionInfo*, void);
+ DECL_LINK_TYPED(decomposeBlockTextPrimitive, DrawPortionInfo*, void);
+ DECL_LINK_TYPED(decomposeStretchTextPrimitive, DrawPortionInfo*, void);
DECL_LINK(decomposeContourBulletPrimitive, DrawBulletInfo* );
DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo* );
@@ -126,7 +126,7 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeContourTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeContourBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetDrawBulletHdl(Link<>());
}
@@ -141,7 +141,7 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeBlockTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeBlockBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetDrawBulletHdl(Link<>());
}
@@ -152,7 +152,7 @@ namespace
mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decomposeStretchTextPrimitive));
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeStretchBulletPrimitive));
mrOutliner.StripPortions();
- mrOutliner.SetDrawPortionHdl(Link<>());
+ mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetDrawBulletHdl(Link<>());
}
@@ -557,7 +557,7 @@ namespace
maTextPortionPrimitives.push_back(pNewPrimitive);
}
- IMPL_LINK(impTextBreakupHandler, decomposeContourTextPrimitive, DrawPortionInfo*, pInfo)
+ IMPL_LINK_TYPED(impTextBreakupHandler, decomposeContourTextPrimitive, DrawPortionInfo*, pInfo, void)
{
// for contour text, ignore (clip away) all portions which are below
// the visible area given by maScale
@@ -565,11 +565,9 @@ namespace
{
impHandleDrawPortionInfo(*pInfo);
}
-
- return 0;
}
- IMPL_LINK(impTextBreakupHandler, decomposeBlockTextPrimitive, DrawPortionInfo*, pInfo)
+ IMPL_LINK_TYPED(impTextBreakupHandler, decomposeBlockTextPrimitive, DrawPortionInfo*, pInfo, void)
{
if(pInfo)
{
@@ -583,7 +581,7 @@ namespace
if(!maClipRange.isInside(aStartPosition))
{
- return 0;
+ return;
}
// Start position is inside. Get TextBoundRect and TopLeft next
@@ -597,7 +595,7 @@ namespace
if(!maClipRange.isInside(aTopLeft))
{
- return 0;
+ return;
}
// TopLeft is inside. Get BottomRight and check
@@ -605,25 +603,21 @@ namespace
if(!maClipRange.isInside(aBottomRight))
{
- return 0;
+ return;
}
// all inside, clip was successful
}
impHandleDrawPortionInfo(*pInfo);
}
-
- return 0;
}
- IMPL_LINK(impTextBreakupHandler, decomposeStretchTextPrimitive, DrawPortionInfo*, pInfo)
+ IMPL_LINK_TYPED(impTextBreakupHandler, decomposeStretchTextPrimitive, DrawPortionInfo*, pInfo, void)
{
if(pInfo)
{
impHandleDrawPortionInfo(*pInfo);
}
-
- return 0;
}
IMPL_LINK(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo)
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 5a7ca174da82..226c07b7192c 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -171,7 +171,7 @@ namespace
SdrOutliner& mrOutliner;
::std::vector< impPathTextPortion > maPathTextPortions;
- DECL_LINK(decompositionPathTextPrimitive, DrawPortionInfo* );
+ DECL_LINK_TYPED(decompositionPathTextPrimitive, DrawPortionInfo*, void );
public:
explicit impTextBreakupHandler(SdrOutliner& rOutliner)
@@ -195,10 +195,9 @@ namespace
}
};
- IMPL_LINK(impTextBreakupHandler, decompositionPathTextPrimitive, DrawPortionInfo*, pInfo)
+ IMPL_LINK_TYPED(impTextBreakupHandler, decompositionPathTextPrimitive, DrawPortionInfo*, pInfo, void)
{
maPathTextPortions.push_back(impPathTextPortion(*pInfo));
- return 0;
}
} // end of anonymous namespace
@@ -791,7 +790,7 @@ void SdrTextObj::impDecomposePathTextPrimitive(
}
// clean up outliner
- rOutliner.SetDrawPortionHdl(Link<>());
+ rOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
rOutliner.Clear();
rOutliner.setVisualizedPage(0);
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index b22259a0a640..679a3d3b1a90 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1836,8 +1836,6 @@ static void lcl_DrawGraphic( const SvxBrushItem& rBrush, vcl::RenderContext *pOu
pOut->IntersectClipRegion( rOut.SVRect() );
}
- // No Link here, we want to load the graphic synchronously!
- const_cast<SvxBrushItem&>(rBrush).SetDoneLink( Link<>() );
GraphicObject *pGrf = const_cast<GraphicObject*>(rBrush.GetGraphicObject());
// Outsource drawing of background with a background color
@@ -1985,11 +1983,7 @@ void DrawGraphic(
rSh.GetOut()->GetOutDevType() == OUTDEV_PRINTER )
{
pBrush->PurgeMedium();
- const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( Link<>() );
}
- else
- const_cast<SvxBrushItem*>(pBrush)->SetDoneLink( LINK(
- rSh.GetDoc(), SwDoc, BackgroundDone ) );
OUString referer;
SfxObjectShell * sh = rSh.GetDoc()->GetPersist();
if (sh != 0 && sh->HasName()) {
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index f53e3eae52f5..6896e9bb5fc6 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -352,7 +352,6 @@ OUString SwReadOnlyPopup::SaveGraphic( sal_uInt16 nId )
{
if ( !aBrushItem.GetGraphicLink().isEmpty() )
sGrfName = aBrushItem.GetGraphicLink();
- aBrushItem.SetDoneLink( Link<>() );
const Graphic *pGrf = aBrushItem.GetGraphic();
if ( pGrf )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-22 08:46:03 +0000