From 9bb254fc85eea7615cf8b9fa3700754fbd4c971c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 9 May 2015 21:35:10 +0200 Subject: NOINSTANCE is implied now in IMPL_STATIC_LINK... Change-Id: Ifb032457d6c1b279c4183282ef2b271c706dd71a --- basctl/source/basicide/baside3.cxx | 2 +- basctl/source/basicide/basobj2.cxx | 2 +- basctl/source/basicide/iderdll.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'basctl/source') diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index b31b4260ab93..1575aa67fc74 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -227,7 +227,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt ) -IMPL_STATIC_LINK_NOINSTANCE( +IMPL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction ) { // #i120515# pUndoAction needs to be deleted, this hand over is an ownership diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 9b8778336994..530d0fc26c5c 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -210,7 +210,7 @@ namespace DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData* ); }; - IMPL_STATIC_LINK_NOINSTANCE( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData ) + IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData ) { ENSURE_OR_RETURN( i_pData, "wrong MacroExecutionData", 0L ); // take ownership of the data diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 36155235fea8..24a2bf4dcf43 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -174,7 +174,7 @@ void ExtraData::SetSearchItem (const SvxSearchItem& rItem) pSearchItem.reset(static_cast(rItem.Clone())); } -IMPL_STATIC_LINK_NOINSTANCE(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic) +IMPL_STATIC_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic) { long nRet = 0; if (Shell* pShell = GetShell()) -- cgit