[Libreoffice-commits] core.git: 4 commits - basctl/source basic/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/test extensions/source forms/source fpicker/source framework/source include/svtools include/tools include/vcl rsc/inc rsc/source sc/inc sc/source sc/workben sd/source sfx2/source starmath/source svl/source svtools/source svx/source sw/source test/source toolkit/source tools/Library_tl.mk tools/source vcl/generic vcl/source vcl/unx
Stephan Bergmann
sbergman at redhat.com
Wed Apr 29 09:30:43 PDT 2015
basctl/source/basicide/baside2b.cxx | 13 -
basctl/source/basicide/basidesh.cxx | 5
basctl/source/basicide/basobj2.cxx | 2
basctl/source/basicide/bastypes.cxx | 9
basctl/source/basicide/brkdlg.cxx | 5
basctl/source/basicide/macrodlg.cxx | 3
basctl/source/basicide/moduldl2.cxx | 9
basctl/source/dlged/dlgedfunc.cxx | 3
basic/source/runtime/ddectrl.cxx | 3
basic/source/runtime/inputbox.cxx | 6
basic/source/runtime/iosys.cxx | 7
cui/source/customize/macropg.cxx | 6
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/dlgname.cxx | 6
cui/source/dialogs/insdlg.cxx | 9
cui/source/dialogs/linkdlg.cxx | 9
cui/source/dialogs/pastedlg.cxx | 3
cui/source/dialogs/postdlg.cxx | 10
cui/source/dialogs/thesdlg.cxx | 2
cui/source/options/optdict.cxx | 5
cui/source/tabpages/labdlg.cxx | 15 -
cui/source/tabpages/macroass.cxx | 10
cui/source/tabpages/page.cxx | 10
cui/source/tabpages/paragrph.cxx | 3
cui/source/tabpages/tabarea.cxx | 5
cui/source/tabpages/tabline.cxx | 5
cui/source/tabpages/tpline.cxx | 4
cui/source/tabpages/tplnedef.cxx | 5
dbaccess/source/ui/dlg/queryfilter.cxx | 4
dbaccess/source/ui/dlg/queryorder.cxx | 4
desktop/source/app/officeipcthread.cxx | 4
editeng/source/editeng/impedit3.cxx | 6
editeng/source/items/numitem.cxx | 6
embeddedobj/test/mtexecutor/mainthreadexecutor.cxx | 2
extensions/source/bibliography/bibview.cxx | 2
extensions/source/bibliography/framectr.cxx | 2
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 1
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2
forms/source/component/clickableimage.cxx | 2
fpicker/source/office/iodlg.cxx | 18 -
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/uielement/complextoolbarcontroller.cxx | 4
framework/source/uielement/generictoolbarcontroller.cxx | 2
framework/source/uielement/macrosmenucontroller.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 2
framework/source/uielement/recentfilesmenucontroller.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 6
framework/source/uielement/toolbarsmenucontroller.cxx | 2
include/svtools/svparser.hxx | 3
include/tools/link.hxx | 172 +++++----------
include/vcl/evntpost.hxx | 1
rsc/inc/rscdef.hxx | 3
rsc/source/parser/rscdb.cxx | 14 -
sc/inc/refreshtimer.hxx | 3
sc/source/core/data/documen9.cxx | 3
sc/source/core/data/userdat.cxx | 3
sc/source/ui/dbgui/dbnamdlg.cxx | 3
sc/source/ui/dbgui/subtdlg.cxx | 3
sc/source/ui/drawfunc/fupoor.cxx | 3
sc/source/ui/miscdlgs/crdlg.cxx | 3
sc/source/ui/miscdlgs/crnrdlg.cxx | 3
sc/source/ui/miscdlgs/delcodlg.cxx | 3
sc/source/ui/miscdlgs/lbseldlg.cxx | 3
sc/source/ui/miscdlgs/mtrindlg.cxx | 3
sc/source/ui/miscdlgs/scuiautofmt.cxx | 3
sc/source/ui/miscdlgs/shtabdlg.cxx | 3
sc/source/ui/navipi/content.cxx | 2
sc/source/ui/view/preview.cxx | 2
sc/source/ui/view/viewdata.cxx | 3
sc/workben/result.cxx | 3
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/func/fupoor.cxx | 6
sd/source/ui/view/Outliner.cxx | 3
sd/source/ui/view/outlview.cxx | 3
sd/source/ui/view/viewshe2.cxx | 6
sfx2/source/appl/appmain.cxx | 2
sfx2/source/appl/fileobj.cxx | 4
sfx2/source/appl/impldde.cxx | 6
sfx2/source/appl/shutdownicon.cxx | 2
sfx2/source/control/dispatch.cxx | 3
sfx2/source/control/recentdocsviewitem.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 9
sfx2/source/dialog/newstyle.cxx | 3
sfx2/source/dialog/passwd.cxx | 5
sfx2/source/dialog/templdlg.cxx | 3
sfx2/source/dialog/tplcitem.cxx | 2
sfx2/source/doc/new.cxx | 13 -
sfx2/source/inet/inettbc.cxx | 2
sfx2/source/menu/mnuitem.cxx | 2
sfx2/source/notify/hintpost.cxx | 5
sfx2/source/view/viewsh.cxx | 4
starmath/source/dialog.cxx | 11
starmath/source/edit.cxx | 6
starmath/source/view.cxx | 4
svl/source/numbers/zforlist.cxx | 2
svtools/source/brwbox/datwin.cxx | 5
svtools/source/contnr/svimpbox.cxx | 7
svtools/source/contnr/treelistbox.cxx | 18 -
svtools/source/control/asynclink.cxx | 4
svtools/source/control/calendar.cxx | 2
svtools/source/control/inettbc.cxx | 2
svtools/source/hatchwindow/documentcloser.cxx | 2
svtools/source/uno/contextmenuhelper.cxx | 2
svtools/source/uno/generictoolboxcontroller.cxx | 2
svtools/source/uno/popupmenucontrollerbase.cxx | 2
svtools/source/uno/popupwindowcontroller.cxx | 2
svtools/source/uno/toolboxcontroller.cxx | 2
svx/source/dialog/fontwork.cxx | 3
svx/source/dialog/hdft.cxx | 9
svx/source/dialog/svxruler.cxx | 3
svx/source/gallery2/galbrws2.cxx | 4
svx/source/mnuctrls/SmartTagCtl.cxx | 5
svx/source/mnuctrls/fntctl.cxx | 5
svx/source/svdraw/svdpntv.cxx | 3
svx/source/tbxctrls/colrctrl.cxx | 2
sw/source/core/doc/htmltbl.cxx | 2
sw/source/core/layout/paintfrm.cxx | 2
sw/source/ui/chrdlg/break.cxx | 9
sw/source/ui/chrdlg/drpcps.cxx | 3
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/optload.cxx | 3
sw/source/ui/config/optpage.cxx | 9
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/mmoutputtypepage.cxx | 6
sw/source/ui/dialog/uiregionsw.cxx | 3
sw/source/ui/envelp/envfmt.cxx | 3
sw/source/ui/envelp/label1.cxx | 6
sw/source/ui/envelp/labfmt.cxx | 9
sw/source/ui/fldui/javaedit.cxx | 6
sw/source/ui/frmdlg/cption.cxx | 6
sw/source/ui/frmdlg/frmpage.cxx | 3
sw/source/ui/index/cnttab.cxx | 3
sw/source/ui/index/multmrk.cxx | 3
sw/source/ui/index/swuiidxmrk.cxx | 12 -
sw/source/ui/misc/docfnote.cxx | 3
sw/source/ui/misc/glossary.cxx | 6
sw/source/ui/misc/insfnote.cxx | 9
sw/source/ui/misc/outline.cxx | 9
sw/source/ui/misc/pgfnote.cxx | 6
sw/source/ui/table/colwd.cxx | 3
sw/source/ui/table/instable.cxx | 3
sw/source/ui/table/tabledlg.cxx | 12 -
sw/source/ui/table/tautofmt.cxx | 3
sw/source/uibase/dbui/dbmgr.cxx | 3
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/shells/textsh2.cxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewling.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 2
sw/source/uibase/utlui/navipi.cxx | 2
test/source/bootstrapfixture.cxx | 2
test/source/vclbootstrapprotector.cxx | 2
toolkit/source/awt/asynccallback.cxx | 2
tools/Library_tl.mk | 1
tools/source/generic/link.cxx | 40 ---
vcl/generic/print/genprnpsp.cxx | 2
vcl/source/app/svapp.cxx | 10
vcl/unx/generic/app/sm.cxx | 8
158 files changed, 319 insertions(+), 594 deletions(-)
New commits:
commit 4a7dcee7456495b03382aff7b04afa4ddfc74444
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 20:48:29 2015 +0200
Clean up tools/link.hxx
Change-Id: I44e4abb228394f99109f7d7e005cfeb26e4b95c1
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 3b287e6..7681831 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -30,6 +30,7 @@
#include <string.h>
#include <tools/link.hxx>
+#include <tools/solar.h>
#include <osl/pipe.hxx>
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index ef98f37..ebf5103 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -93,6 +93,8 @@ extern "C" {
#include <postx.h>
+#include <tools/solar.h>
+
class ConnectorInstance
{
public:
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 8a9d160..575a51d 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -23,6 +23,7 @@
#include <svtools/svtdllapi.h>
#include <tools/link.hxx>
#include <tools/ref.hxx>
+#include <tools/solar.h>
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
#include <boost/noncopyable.hpp>
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index ea55a3eb..2dd0100 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -16,125 +16,100 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef INCLUDED_TOOLS_LINK_HXX
#define INCLUDED_TOOLS_LINK_HXX
-#include <tools/toolsdllapi.h>
#include <sal/config.h>
+
#include <sal/types.h>
-#include <tools/solar.h>
+#include <tools/toolsdllapi.h>
-typedef sal_IntPtr (*PSTUB)( void*, void* );
+#define DECL_LINK(Member, ArgType) \
+ static sal_IntPtr LinkStub##Member(void *, void *); \
+ sal_IntPtr Member(ArgType)
-#define DECL_LINK( Method, ArgType ) \
- sal_IntPtr Method( ArgType ); \
- static sal_IntPtr LinkStub##Method( void* pThis, void* )
+#define DECL_STATIC_LINK(Class, Member, ArgType) \
+ static sal_IntPtr LinkStub##Member(void *, void *); \
+ static sal_IntPtr Member(Class *, ArgType)
-#define DECL_STATIC_LINK( Class, Method, ArgType ) \
- static sal_IntPtr LinkStub##Method( void* pThis, void* ); \
- static sal_IntPtr Method( Class*, ArgType )
+#define DECL_DLLPRIVATE_LINK(Member, ArgType) \
+ SAL_DLLPRIVATE static sal_IntPtr LinkStub##Member(void *, void *); \
+ SAL_DLLPRIVATE sal_IntPtr Member(ArgType)
-#define DECL_DLLPRIVATE_LINK(Method, ArgType) \
- SAL_DLLPRIVATE sal_IntPtr Method(ArgType); \
- SAL_DLLPRIVATE static sal_IntPtr LinkStub##Method(void * pThis, void *)
+#define DECL_DLLPRIVATE_STATIC_LINK(Class, Member, ArgType) \
+ SAL_DLLPRIVATE static sal_IntPtr LinkStub##Member(void *, void *); \
+ SAL_DLLPRIVATE static sal_IntPtr Member(Class *, ArgType)
-#define DECL_DLLPRIVATE_STATIC_LINK(Class, Method, ArgType) \
- SAL_DLLPRIVATE static sal_IntPtr LinkStub##Method( void* pThis, void* ); \
- SAL_DLLPRIVATE static sal_IntPtr Method(Class *, ArgType)
+#define IMPL_LINK(Class, Member, ArgType, ArgName) \
+ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \
+ return static_cast<Class *>(instance)->Member( \
+ static_cast<ArgType>(data)); \
+ } \
+ sal_IntPtr Class::Member(ArgType ArgName)
-#define IMPL_STUB(Class, Method, ArgType) \
- sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
- { \
- return static_cast<Class*>(pThis)->Method( static_cast<ArgType>(pCaller) ); \
- }
+#define IMPL_LINK_NOARG(Class, Member) \
+ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \
+ return static_cast<Class *>(instance)->Member(data); \
+ } \
+ sal_IntPtr Class::Member(SAL_UNUSED_PARAMETER void *)
-#define IMPL_STATIC_LINK( Class, Method, ArgType, ArgName ) \
- sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
- { \
- return Method( static_cast<Class*>(pThis), static_cast<ArgType>(pCaller) ); \
+#define IMPL_STATIC_LINK(Class, Member, ArgType, ArgName) \
+ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \
+ return Member( \
+ static_cast<Class *>(instance), static_cast<ArgType>(data)); \
} \
- sal_IntPtr Class::Method( Class* pThis, ArgType ArgName )
+ sal_IntPtr Class::Member(Class * pThis, ArgType ArgName)
-#define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \
- sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
- { \
- return Method( static_cast<Class*>(pThis), static_cast<ArgType>(pCaller) ); \
+#define IMPL_STATIC_LINK_NOINSTANCE(Class, Member, ArgType, ArgName) \
+ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \
+ return Member( \
+ static_cast<Class *>(instance), static_cast<ArgType>(data)); \
} \
- sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName )
+ sal_IntPtr Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName)
-#define IMPL_STATIC_LINK_NOINSTANCE_NOARG( Class, Method ) \
- sal_IntPtr Class::LinkStub##Method( void* pThis, void* pCaller) \
- { \
- return Method( static_cast<Class*>(pThis), pCaller ); \
+#define IMPL_STATIC_LINK_NOINSTANCE_NOARG(Class, Member) \
+ sal_IntPtr Class::LinkStub##Member(void * instance, void * data) { \
+ return Member(static_cast<Class *>(instance), data); \
} \
- sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER Class*, SAL_UNUSED_PARAMETER void* )
+ sal_IntPtr Class::Member( \
+ SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER void *)
+
+#define LINK(Instance, Class, Member) \
+ Link(static_cast<Class *>(Instance), &Class::LinkStub##Member)
-#define LINK( Inst, Class, Member ) \
- Link( static_cast<Class*>(Inst), &Class::LinkStub##Member )
+#define EMPTYARG
-#define IMPL_LINK( Class, Method, ArgType, ArgName ) \
- IMPL_STUB( Class, Method, ArgType ) \
- sal_IntPtr Class::Method( ArgType ArgName )
+class TOOLS_DLLPUBLIC Link {
+public:
+ typedef sal_IntPtr Stub(void *, void *);
-#define IMPL_LINK_NOARG( Class, Method ) \
- IMPL_STUB( Class, Method, void* ) \
- sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER void* )
+ Link(): function_(nullptr), instance_(nullptr) {}
-#define EMPTYARG
+ Link(void * instance, Stub * function):
+ function_(function), instance_(instance) {}
-class TOOLS_DLLPUBLIC Link
-{
- void* pInst;
- PSTUB pFunc;
+ sal_IntPtr Call(void * data) const
+ { return function_ == nullptr ? 0 : (*function_)(instance_, data); }
-public:
- Link();
- Link( void* pLinkHdl, PSTUB pMemFunc );
+ bool IsSet() const { return function_ != nullptr; }
- sal_IntPtr Call( void* pCaller ) const;
+ bool operator !() const { return !IsSet(); }
- bool IsSet() const;
- bool operator !() const;
+ bool operator <(Link const & other) const {
+ return reinterpret_cast<sal_uIntPtr>(function_)
+ < reinterpret_cast<sal_uIntPtr>(other.function_);
+ };
- bool operator==( const Link& rLink ) const;
- bool operator!=( const Link& rLink ) const
- { return !(Link::operator==( rLink )); }
- bool operator<( const Link& rLink ) const
- { return reinterpret_cast<sal_uIntPtr>(rLink.pFunc) < reinterpret_cast<sal_uIntPtr>(pFunc); }
-};
+ bool operator ==(Link const & other) const
+ { return function_ == other.function_ && instance_ == other.instance_; };
+
+ bool operator !=(Link const & other) const { return !operator ==(other); };
-inline Link::Link()
-{
- pInst = 0;
- pFunc = 0;
-}
-
-inline Link::Link( void* pLinkHdl, PSTUB pMemFunc )
-{
- pInst = pLinkHdl;
- pFunc = pMemFunc;
-}
-
-inline sal_IntPtr Link::Call(void *pCaller) const
-{
- return pFunc ? (*pFunc)(pInst, pCaller) : 0;
-}
-
-inline bool Link::IsSet() const
-{
- if ( pFunc )
- return true;
- else
- return false;
-}
-
-inline bool Link::operator !() const
-{
- if ( !pFunc )
- return true;
- else
- return false;
-}
+private:
+ Stub * function_;
+ void * instance_;
+};
#endif
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 5989823..86b38f6 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_VCL_EVNTPOST_HXX
#include <tools/link.hxx>
+#include <tools/solar.h>
#include <vcl/dllapi.h>
struct ImplSVEvent;
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 0697012..f6d378d 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -19,6 +19,9 @@
#ifndef INCLUDED_RSC_INC_RSCDEF_HXX
#define INCLUDED_RSC_INC_RSCDEF_HXX
+#include <sal/config.h>
+
+#include <tools/solar.h>
#include <tools/unqidx.hxx>
#include <rsctree.hxx>
#include <rtl/strbuf.hxx>
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index cbc8e5c..68f2b95 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -20,6 +20,9 @@
#ifndef INCLUDED_SC_INC_REFRESHTIMER_HXX
#define INCLUDED_SC_INC_REFRESHTIMER_HXX
+#include <sal/config.h>
+
+#include <tools/solar.h>
#include <vcl/timer.hxx>
#include <osl/mutex.hxx>
#include "scdllapi.h"
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index d399548..2d105cd 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/generic/fract \
tools/source/generic/gen \
tools/source/generic/line \
- tools/source/generic/link \
tools/source/generic/point \
tools/source/generic/poly \
tools/source/generic/poly2 \
diff --git a/tools/source/generic/link.cxx b/tools/source/generic/link.cxx
deleted file mode 100644
index b172610..0000000
--- a/tools/source/generic/link.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <tools/link.hxx>
-
-bool Link::operator==( const Link& rLink ) const
-{
- if ( pFunc == rLink.pFunc )
- {
- if ( pFunc )
- {
- if ( pInst == rLink.pInst )
- return true;
- else
- return false;
- }
- else
- return true;
- }
- else
- return false;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0acd47f68e3efb46dafd866ee95497da818fa34f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 29 17:05:19 2015 +0200
Remove unnecessary IMPL_LINK[_NOARG]_INLINE_START/END
...just use IMPL_LINK[_NOARG] and let the compiler decide what to inline
Change-Id: I63ec5116df7e79093ebf31193f8c674f1351c0e6
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 6cbaaf5..5182ebd 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1808,18 +1808,15 @@ bool WatchWindow::RemoveSelectedWatch()
}
-IMPL_LINK_INLINE_START( WatchWindow, ButtonHdl, ImageButton *, pButton )
+IMPL_LINK( WatchWindow, ButtonHdl, ImageButton *, pButton )
{
if (pButton == aRemoveWatchButton.get())
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH);
return 0;
}
-IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton )
-
-
-IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
+IMPL_LINK_NOARG(WatchWindow, TreeListHdl)
{
SvTreeListEntry* pCurEntry = aTreeListBox->GetCurEntry();
if ( pCurEntry && pCurEntry->GetUserData() )
@@ -1827,10 +1824,8 @@ IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(WatchWindow, TreeListHdl)
-
-IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
+IMPL_LINK( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
{
(void)pBar;
@@ -1862,8 +1857,6 @@ IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
}
return 0;
}
-IMPL_LINK_INLINE_END( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
-
IMPL_LINK( WatchWindow, EditAccHdl, Accelerator *, pAcc )
{
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 214c5b6..1c01f29 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -440,7 +440,7 @@ void Shell::OuterResizePixel( const Point &rPos, const Size &rSize )
}
-IMPL_LINK_INLINE_START( Shell, TabBarSplitHdl, TabBar *, pTBar )
+IMPL_LINK( Shell, TabBarSplitHdl, TabBar *, pTBar )
{
(void)pTBar;
bTabBarSplitted = true;
@@ -448,9 +448,6 @@ IMPL_LINK_INLINE_START( Shell, TabBarSplitHdl, TabBar *, pTBar )
return 0;
}
-IMPL_LINK_INLINE_END( Shell, TabBarSplitHdl, TabBar *, pTBar )
-
-
IMPL_LINK( Shell, TabBarHdl, TabBar *, pCurTabBar )
{
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 6efa5cb..278ac2f 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -97,13 +97,11 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll )
-IMPL_LINK_INLINE_START( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
+IMPL_LINK( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
{
DoScroll( pCurScrollBar );
return 0;
}
-IMPL_LINK_INLINE_END( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
-
void BaseWindow::ExecuteCommand (SfxRequest&)
{ }
@@ -456,14 +454,11 @@ IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl)
}
-IMPL_LINK_INLINE_START( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
+IMPL_LINK( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
{
aAccHdl.Call( pAcc );
return 0;
}
-IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc )
-
-
// TabBar
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index fa8399a..eff2c10 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -150,7 +150,7 @@ void BreakPointDialog::CheckButtons()
}
}
-IMPL_LINK_INLINE_START( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
+IMPL_LINK( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
{
BreakPoint* pBrk = GetSelectedBreakPoint();
if ( pBrk )
@@ -158,9 +158,6 @@ IMPL_LINK_INLINE_START( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
return 0;
}
-IMPL_LINK_INLINE_END( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx )
-
-
IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox *, pBox )
{
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 2960bfa..7dbd983 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -468,7 +468,7 @@ void MacroChooser::CheckButtons()
-IMPL_LINK_NOARG_INLINE_START(MacroChooser, MacroDoubleClickHdl)
+IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl)
{
StoreMacroDescription();
if (nMode == Recording)
@@ -481,7 +481,6 @@ IMPL_LINK_NOARG_INLINE_START(MacroChooser, MacroDoubleClickHdl)
EndDialog(Macro_OkRun);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(MacroChooser, MacroDoubleClickHdl)
IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
{
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 7ac4766..2f0fcb4 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -606,22 +606,20 @@ void LibPage::DeactivatePage()
{
}
-IMPL_LINK_INLINE_START( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
+IMPL_LINK( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
{
if ( pBox->IsSelected( pBox->GetHdlEntry() ) )
CheckButtons();
return 0;
}
-IMPL_LINK_INLINE_END( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
-IMPL_LINK_INLINE_START( LibPage, BasicSelectHdl, ListBox *, pBox )
+IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, pBox )
{
(void)pBox;
SetCurLib();
CheckButtons();
return 0;
}
-IMPL_LINK_INLINE_END( LibPage, BasicSelectHdl, ListBox *, pBox )
IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
{
@@ -712,7 +710,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
return 0;
}
-IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
+IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
{
long nRet = 0;
@@ -736,7 +734,6 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
return nRet;
}
-IMPL_LINK_INLINE_END( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
void LibPage::NewLib()
{
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 3937b20..05ca39d 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -27,7 +27,7 @@
namespace basctl
{
-IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
+IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
{
(void)pTimer;
vcl::Window& rWindow = rParent.GetWindow();
@@ -36,7 +36,6 @@ IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
ForceScroll( aPos );
return 0;
}
-IMPL_LINK_INLINE_END( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
void DlgEdFunc::ForceScroll( const Point& rPos )
{
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 9720877..0e942fc 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -129,7 +129,7 @@ void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize)
}
-IMPL_LINK_INLINE_START( SvRTLInputBox, OkHdl, Button *, pButton )
+IMPL_LINK( SvRTLInputBox, OkHdl, Button *, pButton )
{
(void)pButton;
@@ -137,9 +137,8 @@ IMPL_LINK_INLINE_START( SvRTLInputBox, OkHdl, Button *, pButton )
EndDialog( 1 );
return 0;
}
-IMPL_LINK_INLINE_END( SvRTLInputBox, OkHdl, Button *, pButton )
-IMPL_LINK_INLINE_START( SvRTLInputBox, CancelHdl, Button *, pButton )
+IMPL_LINK( SvRTLInputBox, CancelHdl, Button *, pButton )
{
(void)pButton;
@@ -147,7 +146,6 @@ IMPL_LINK_INLINE_START( SvRTLInputBox, CancelHdl, Button *, pButton )
EndDialog( 0 );
return 0;
}
-IMPL_LINK_INLINE_END( SvRTLInputBox, CancelHdl, Button *, pButton )
// *********************************************************************
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index f409200..f495827 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -115,7 +115,7 @@ void SbiInputDialog::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_INLINE_START( SbiInputDialog, Ok, vcl::Window *, pWindow )
+IMPL_LINK( SbiInputDialog, Ok, vcl::Window *, pWindow )
{
(void)pWindow;
@@ -123,17 +123,14 @@ IMPL_LINK_INLINE_START( SbiInputDialog, Ok, vcl::Window *, pWindow )
EndDialog( 1 );
return 0;
}
-IMPL_LINK_INLINE_END( SbiInputDialog, Ok, vcl::Window *, pWindow )
-IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, vcl::Window *, pWindow )
+IMPL_LINK( SbiInputDialog, Cancel, vcl::Window *, pWindow )
{
(void)pWindow;
EndDialog( 0 );
return 0;
}
-IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, vcl::Window *, pWindow )
-
SbiStream::SbiStream()
: pStrm(0)
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 7745404..60849f1 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -191,21 +191,19 @@ void SvxMessDialog::dispose()
/*************************************************************************/
-IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button1Hdl)
+IMPL_LINK_NOARG(SvxMessDialog, Button1Hdl)
{
EndDialog( RET_BTN_1 );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button1Hdl)
/*************************************************************************/
-IMPL_LINK_NOARG_INLINE_START(SvxMessDialog, Button2Hdl)
+IMPL_LINK_NOARG(SvxMessDialog, Button2Hdl)
{
EndDialog( RET_BTN_2 );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxMessDialog, Button2Hdl)
/*************************************************************************/
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 22c3c27..b256fa4 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -102,14 +102,11 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OU
-IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl)
+IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl)
{
EndDialog( RET_OK );
return 0;
}
-IMPL_LINK_INLINE_END( SvInsertOleDlg, DoubleClickHdl, ListBox *, pListBox )
-
-
IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl)
{
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 0995ae4..c947538 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -250,16 +250,15 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
return 0;
}
-IMPL_LINK_INLINE_START( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
+IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
{
(void)pSvTabListBox;
ChangeSourceClickHdl( 0 );
return 0;
}
-IMPL_LINK_INLINE_END( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox )
-IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton )
+IMPL_LINK( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton )
{
(void)pRadioButton;
@@ -270,9 +269,8 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadio
SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS );
return 0;
}
-IMPL_LINK_INLINE_END( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton )
-IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton )
+IMPL_LINK( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton )
{
(void)pRadioButton;
@@ -283,7 +281,6 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut
SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL );
return 0;
}
-IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton )
IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
{
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index ff6263a..4c1d5ab 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -83,14 +83,13 @@ IMPL_LINK( SvPasteObjectDialog, SelectHdl, ListBox *, pListBox )
return 0;
}
-IMPL_LINK_INLINE_START( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox )
+IMPL_LINK( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox )
{
(void)pListBox;
EndDialog( RET_OK );
return 0;
}
-IMPL_LINK_INLINE_END( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox )
/*************************************************************************
|* SvPasteObjectDialog::Insert()
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index c1e43e1..0db4949 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -174,23 +174,17 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev)
-IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl)
+IMPL_LINK_NOARG(SvxPostItDialog, PrevHdl)
{
aPrevHdlLink.Call( this );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, PrevHdl)
-
-
-IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl)
+IMPL_LINK_NOARG(SvxPostItDialog, NextHdl)
{
aNextHdlLink.Call( this );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl)
-
-
IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
{
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index de08c8b..3b78f4c 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -206,7 +206,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
-IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl)
+IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl)
{
if ( !pNameEdit->GetText().isEmpty() )
pOKBtn->Enable();
@@ -214,9 +214,6 @@ IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl)
pOKBtn->Disable();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl)
-
-
// class SvxEditDictionaryDialog -------------------------------------------
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index d57e180..1f05317 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -422,7 +422,7 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
-IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox )
+IMPL_LINK( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox )
{
if (pListBox == m_pLB_ANSATZ)
{
@@ -430,11 +430,8 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pLis
}
return 0;
}
-IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox )
-
-
-IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox )
+IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox )
{
if (pListBox == m_pLB_ANSATZ_REL)
{
@@ -442,9 +439,6 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, p
}
return 0;
}
-IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox )
-
-
IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
{
@@ -466,14 +460,11 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
-IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
+IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
{
SetupType_Impl( m_pCT_CAPTTYPE->GetSelectItemId() );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
-
-
void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType )
{
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 6a37a3d..df8eb10 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1184,16 +1184,13 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
-IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl)
+IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl)
{
if ( !bBorderModified )
bBorderModified = true;
UpdateExample_Impl();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, BorderModify_Impl)
-
-
void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
{
@@ -1652,16 +1649,13 @@ void SvxPageDescPage::CalcMargin_Impl()
-IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, CenterHdl_Impl)
+IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl)
{
m_pBspWin->SetHorz( m_pHorzBox->IsChecked() );
m_pBspWin->SetVert( m_pVertBox->IsChecked() );
UpdateExample_Impl();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, CenterHdl_Impl)
-
-
void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList)
{
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 56b1345..0d2dc16 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -823,12 +823,11 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SvxStdParagraphTabPage, ModifyHdl_Impl)
+IMPL_LINK_NOARG(SvxStdParagraphTabPage, ModifyHdl_Impl)
{
UpdateExample_Impl();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxStdParagraphTabPage, ModifyHdl_Impl)
void SvxStdParagraphTabPage::Init_Impl()
{
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 53835ac..7ecc836 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -216,16 +216,13 @@ short SvxAreaTabDialog::Ok()
-IMPL_LINK_NOARG_INLINE_START(SvxAreaTabDialog, CancelHdlImpl)
+IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl)
{
SavePalettes();
EndDialog( RET_CANCEL );
return 0;
}
-IMPL_LINK_INLINE_END( SvxAreaTabDialog, CancelHdlImpl, void *, p )
-
-
void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 71a7a56..aa99b2c 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -177,16 +177,13 @@ short SvxLineTabDialog::Ok()
-IMPL_LINK_NOARG_INLINE_START(SvxLineTabDialog, CancelHdlImpl)
+IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl)
{
SavePalettes();
EndDialog( RET_CANCEL );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxLineTabDialog, CancelHdlImpl)
-
-
void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 32309ac..c2448b2 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -391,16 +391,13 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
-IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl)
+IMPL_LINK_NOARG(SvxLineDefTabPage, ChangePreviewHdl_Impl)
{
FillDash_Impl();
m_pCtlPreview->Invalidate();
return 0L;
}
-IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl)
-
-
IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl)
{
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index a86bd63..028f7b1 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -744,14 +744,12 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
return 0;
}
-IMPL_LINK_INLINE_START( DlgFilterCrit, ListSelectCompHdl, ListBox *, /*pListBox*/ )
+IMPL_LINK( DlgFilterCrit, ListSelectCompHdl, ListBox *, /*pListBox*/ )
{
EnableLines();
return 0;
}
-IMPL_LINK_INLINE_END( DlgFilterCrit, ListSelectCompHdl, ListBox *, pListBox )
-
void DlgFilterCrit::BuildWherePart()
{
Sequence<Sequence<PropertyValue> > aFilter,aHaving;
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 410598b..d047143 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -143,14 +143,12 @@ void DlgOrderCrit::dispose()
ModalDialog::dispose();
}
-IMPL_LINK_INLINE_START( DlgOrderCrit, FieldListSelectHdl, ListBox *, /*pListBox*/ )
+IMPL_LINK( DlgOrderCrit, FieldListSelectHdl, ListBox *, /*pListBox*/ )
{
EnableLines();
return 0;
}
-IMPL_LINK_INLINE_END( DlgOrderCrit, FieldListSelectHdl, ListBox *, pListBox )
-
void DlgOrderCrit::impl_initializeOrderList_nothrow()
{
try
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 915cced..34f9f1c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -318,7 +318,7 @@ IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(ImpEditEngine, IdleFormatHdl)
+IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl)
{
aIdleFormatter.ResetRestarts();
@@ -336,7 +336,6 @@ IMPL_LINK_NOARG_INLINE_START(ImpEditEngine, IdleFormatHdl)
}
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ImpEditEngine, IdleFormatHdl)
void ImpEditEngine::CheckIdleFormatter()
{
@@ -4017,12 +4016,11 @@ void ImpEditEngine::InvalidateFromParagraph( sal_Int32 nFirstInvPara )
pTmpPortion->ResetHeight();
}
-IMPL_LINK_NOARG_INLINE_START(ImpEditEngine, StatusTimerHdl)
+IMPL_LINK_NOARG(ImpEditEngine, StatusTimerHdl)
{
CallStatusHdl();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ImpEditEngine, StatusTimerHdl)
void ImpEditEngine::CallStatusHdl()
{
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index ea3a366..ea55a3eb 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -80,18 +80,6 @@ typedef sal_IntPtr (*PSTUB)( void*, void* );
IMPL_STUB( Class, Method, void* ) \
sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER void* )
-#define IMPL_LINK_INLINE_START( Class, Method, ArgType, ArgName ) \
- inline sal_IntPtr Class::Method( ArgType ArgName )
-
-#define IMPL_LINK_INLINE_END( Class, Method, ArgType, ArgName ) \
- IMPL_STUB( Class, Method, ArgType )
-
-#define IMPL_LINK_NOARG_INLINE_START( Class, Method ) \
- inline sal_IntPtr Class::Method( SAL_UNUSED_PARAMETER void* )
-
-#define IMPL_LINK_NOARG_INLINE_END( Class, Method ) \
- IMPL_STUB( Class, Method, void* )
-
#define EMPTYARG
class TOOLS_DLLPUBLIC Link
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 75aa7ec..de6844f 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -383,7 +383,7 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode )
return 0;
}
-IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode )
+IMPL_LINK( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode )
{
if( pObjNode->GetFileKey() == lFileKey )
{
@@ -394,7 +394,6 @@ IMPL_LINK_INLINE_START( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode )
}
return 0;
}
-IMPL_LINK_INLINE_END( RscEnumerateObj, CallBackWriteSrc, ObjNode *, pObjNode )
void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut )
{
@@ -474,19 +473,17 @@ public:
}
};
-IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteRc, RscTop *, pRef )
+IMPL_LINK( RscEnumerateRef, CallBackWriteRc, RscTop *, pRef )
{
aEnumObj.WriteRc( pRef, pRef->GetObjNode() );
return 0;
}
-IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteRc, RscTop *, pRef )
-IMPL_LINK_INLINE_START( RscEnumerateRef, CallBackWriteSrc, RscTop *, pRef )
+
+IMPL_LINK( RscEnumerateRef, CallBackWriteSrc, RscTop *, pRef )
{
aEnumObj.WriteSrc( pRef, pRef->GetObjNode() );
return 0;
}
-IMPL_LINK_INLINE_END( RscEnumerateRef, CallBackWriteSrc, RscTop *, pRef )
-
ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
{
@@ -576,13 +573,12 @@ inline RscDel::RscDel( RscTop * pRoot, sal_uLong lKey )
pRoot->EnumNodes( LINK( this, RscDel, Delete ) );
}
-IMPL_LINK_INLINE_START( RscDel, Delete, RscTop *, pNode )
+IMPL_LINK( RscDel, Delete, RscTop *, pNode )
{
if( pNode->GetObjNode() )
pNode->pObjBiTree = pNode->GetObjNode()->DelObjNode( pNode, lFileKey );
return 0;
}
-IMPL_LINK_INLINE_END( RscDel, Delete, RscTop *, pNode )
void RscTypCont :: Delete( sal_uLong lFileKey )
{
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 2ec2a17..f780169 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -232,11 +232,10 @@ bool ScDocument::IsChart( const SdrObject* pObject )
return false;
}
-IMPL_LINK_INLINE_START( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex )
+IMPL_LINK( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex )
{
return reinterpret_cast<sal_IntPtr>( &((GetColorList()->GetColor(*pColorIndex))->GetColor()) );
}
-IMPL_LINK_INLINE_END( ScDocument, GetUserDefinedColor, sal_uInt16 *, pColorIndex )
void ScDocument::DeleteDrawLayer()
{
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index cb5566e..371c6e4 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -31,7 +31,7 @@ ScDrawObjFactory::~ScDrawObjFactory()
SdrObjFactory::RemoveMakeUserDataHdl( LINK ( this, ScDrawObjFactory, MakeUserData ) );
}
-IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory )
+IMPL_LINK( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory )
{
if ( pObjFactory->nInventor == SC_DRAWLAYER )
{
@@ -48,7 +48,6 @@ IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFac
}
return 0;
}
-IMPL_LINK_INLINE_END( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory )
ScDrawObjData::ScDrawObjData() :
SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ),
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 7df39d8..3343c90 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -400,12 +400,11 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl)
+IMPL_LINK_NOARG(ScDbNameDlg, CancelBtnHdl)
{
Close();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl)
IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
{
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 45132c0..9e34ba7 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -47,7 +47,7 @@ void ScSubTotalDlg::dispose()
SfxTabDialog::dispose();
}
-IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn )
+IMPL_LINK( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn )
{
if (pBtn == m_pBtnRemove)
{
@@ -55,6 +55,5 @@ IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn )
}
return 0;
}
-IMPL_LINK_INLINE_END( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn )
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 46b4132..ac4b978 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -126,7 +126,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
|*
\************************************************************************/
-IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl)
+IMPL_LINK_NOARG(FuPoor, ScrollHdl)
{
Point aPosPixel = pWindow->GetPointerPosPixel();
@@ -136,7 +136,6 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl)
return 0;
}
-IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer )
// moved from inline to *.cxx
bool FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 497a76e..f4dbff4 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -59,11 +59,10 @@ void ScColOrRowDlg::dispose()
}
-IMPL_LINK_NOARG_INLINE_START(ScColOrRowDlg, OkHdl)
+IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl)
{
EndDialog( m_pBtnCols->IsChecked() ? SCRET_COLS : SCRET_ROWS );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScColOrRowDlg, OkHdl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index c219514..55ca2df 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -517,12 +517,11 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(ScColRowNameRangesDlg, CancelBtnHdl)
+IMPL_LINK_NOARG(ScColRowNameRangesDlg, CancelBtnHdl)
{
Close();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScColRowNameRangesDlg, CancelBtnHdl)
// handler called when add button clicked: set ranges and add to listbox
IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 911af87..3ebd534 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -150,12 +150,11 @@ void ScDeleteContentsDlg::DisableObjects()
aBtnDelObjects->Disable();
}
-IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl)
+IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl)
{
DisableChecks( aBtnDelAll->IsChecked() );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScDeleteContentsDlg, DelAllHdl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 2528212..e869d70 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -58,11 +58,10 @@ OUString ScSelEntryDlg::GetSelectEntry() const
return m_pLb->GetSelectEntry();
}
-IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl)
+IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl)
{
EndDialog( RET_OK );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScSelEntryDlg, DblClkHdl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index ce23d37..f59a36c 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -108,11 +108,10 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl)
+IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl)
{
m_pBtnDefVal->Check( nDefaultValue == m_pEdValue->GetValue() );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScMetricInputDlg, ModifyHdl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 6a11570..8a5d071 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -175,7 +175,7 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl)
+IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl)
{
if ( bCoreDataChanged )
ScGlobal::GetOrCreateAutoFormat()->Save();
@@ -183,7 +183,6 @@ IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl)
EndDialog( RET_OK );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl)
IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
{
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 7898fc9..d4c7339 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -81,11 +81,10 @@ sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const
return m_pLb->GetSelectEntryPos(nPos);
}
-IMPL_LINK_NOARG_INLINE_START(ScShowTabDlg, DblClkHdl)
+IMPL_LINK_NOARG(ScShowTabDlg, DblClkHdl)
{
EndDialog( RET_OK );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScShowTabDlg, DblClkHdl)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index f2239a0..1f824dc 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1090,11 +1090,10 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
// needed, wenn position changed
}
-IMPL_LINK_NOARG_INLINE_START(ScViewData, EmptyEditHdl)
+IMPL_LINK_NOARG(ScViewData, EmptyEditHdl)
{
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(ScViewData, EmptyEditHdl)
IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus )
{
diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx
index 3f95195..7d43f8d 100644
--- a/sc/workben/result.cxx
+++ b/sc/workben/result.cxx
@@ -50,13 +50,12 @@ void ScAddInResult::NewValue()
(*aListeners[n])->modified( aEvent );
}
-IMPL_LINK_INLINE_START( ScAddInResult, TimeoutHdl, Timer*, pT )
+IMPL_LINK( ScAddInResult, TimeoutHdl, Timer*, pT )
{
NewValue();
pT->Start();
return 0;
}
-IMPL_LINK_INLINE_END( ScAddInResult, TimeoutHdl, Timer*, pT )
ScAddInResult::~ScAddInResult()
{
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 8ea8462..d8da144 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -177,7 +177,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
/**
* timer handler for window scrolling
*/
-IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl)
+IMPL_LINK_NOARG(FuPoor, ScrollHdl)
{
Point aPnt(mpWindow->GetPointerPosPixel());
@@ -187,7 +187,6 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl)
return 0;
}
-IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer )
/**
* handle keyboard events
@@ -983,7 +982,7 @@ bool FuPoor::Command(const CommandEvent& rCEvt)
/**
* Timer handler for window scrolling
*/
-IMPL_LINK_NOARG_INLINE_START(FuPoor, DelayHdl)
+IMPL_LINK_NOARG(FuPoor, DelayHdl)
{
aDelayToScrollTimer.Stop ();
bScrollable = true;
@@ -996,7 +995,6 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, DelayHdl)
return 0;
}
-IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer )
bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
{
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 3ec2a1b..17aadc8 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1314,7 +1314,7 @@ void Outliner::EnterEditMode (bool bGrabFocus)
/**
* SpellChecker: Error link handler
*/
-IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang )
+IMPL_LINK( Outliner, SpellError, void *, nLang )
{
mbError = true;
OUString aError( SvtLanguageTable::GetLanguageString( (LanguageType)reinterpret_cast<sal_uLong>(nLang) ) );
@@ -1322,7 +1322,6 @@ IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang )
ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) );
return 0;
}
-IMPL_LINK_INLINE_END( Outliner, SpellError, void *, nLang )
ESelection Outliner::GetSearchStartPosition()
{
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 03223da..8b0ba72 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1209,11 +1209,10 @@ IMPL_LINK_NOARG(OutlineView, RemovingPagesHdl)
/**
* Handler for indenting level 0 paragraphs (pages): Warning
*/
-IMPL_LINK_INLINE_START( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView )
+IMPL_LINK( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView )
{
return RemovingPagesHdl(pOutlinerView);
}
-IMPL_LINK_INLINE_END( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView )
/** returns the first slide that is selected in the outliner or where
the cursor is located */
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 7d0bed8..9969d0f 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -134,11 +134,10 @@ void ViewShell::UpdateScrollBars()
/**
* Handling for horizontal Scrollbars
*/
-IMPL_LINK_INLINE_START(ViewShell, HScrollHdl, ScrollBar *, pHScroll )
+IMPL_LINK(ViewShell, HScrollHdl, ScrollBar *, pHScroll )
{
return VirtHScrollHdl(pHScroll);
}
-IMPL_LINK_INLINE_END(ViewShell, HScrollHdl, ScrollBar *, pHScroll )
/**
* virtual scroll handler for horizontal Scrollbars
@@ -191,11 +190,10 @@ long ViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
/**
* handling for vertical Scrollbars
*/
-IMPL_LINK_INLINE_START(ViewShell, VScrollHdl, ScrollBar *, pVScroll )
+IMPL_LINK(ViewShell, VScrollHdl, ScrollBar *, pVScroll )
{
return VirtVScrollHdl(pVScroll);
}
-IMPL_LINK_INLINE_END(ViewShell, VScrollHdl, ScrollBar *, pVScroll )
/**
* handling for vertical Scrollbars
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index a7a4f22..51644e7 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -495,7 +495,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode)
It flushes the Stack, if it is dirty, thus it actually executes the
pending Push and Pop commands.
*/
-IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid )
+IMPL_LINK( SfxDispatcher, EventHdl_Impl, void *, pvoid )
{
(void)pvoid; // unused
@@ -506,7 +506,6 @@ IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid )
pBindings->StartUpdate_Impl(false);
return 0;
}
-IMPL_LINK_INLINE_END( SfxDispatcher, EventHdl_Impl, void *, pvoid )
/** With this method it can be tested whether the <SfxShell> rShell is on the
stack, when it was flushed. This way the SfxDispatcher is not actually
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 47c5988..5bc78c4 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -419,7 +419,7 @@ bool SfxManageStyleSheetPage::Execute_Impl(
}
-IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
+IMPL_LINK( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
/* [Description]
@@ -430,10 +430,8 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
aBuf = comphelper::string::stripStart(pEdit->GetText(), ' ');
return 0;
}
-IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
-
-IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
+IMPL_LINK( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
/* [Description]
@@ -450,9 +448,6 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
UpdateName_Impl(m_pFollowLb, aStr);
return 0;
}
-IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
-
-
bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index d3f26dc..0824e3d 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -50,12 +50,11 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
return 0;
}
-IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
+IMPL_LINK( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
{
m_pOKBtn->Enable( !comphelper::string::remove(pBox->GetText(), ' ').isEmpty() );
return 0;
}
-IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool )
: ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui")
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 0b6a202..e120179 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -29,7 +29,7 @@
-IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
+IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
{
if (mbAsciiOnly && (pEdit == mpPassword1ED || pEdit == mpPassword2ED))
{
@@ -59,9 +59,6 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
mpOKBtn->Enable( bEnable );
return 0;
}
-IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit)
-
-
IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 1a922bb..53dca48 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2430,13 +2430,12 @@ bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
}
}
-IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
+IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
{
const sal_uInt16 nEntry = pBox->GetCurItemId();
FamilySelect(nEntry);
return 0;
}
-IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
static OUString lcl_GetLabel(uno::Any& rAny)
{
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 7a854971..78884e5 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -268,13 +268,11 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand)
+IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Expand)
{
TemplateSelect(m_pTemplateLb);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, Expand)
-
IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
{
@@ -290,7 +288,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
return 0;
}
-IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox )
+IMPL_LINK( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox )
{
(void)pListBox;
// Still loadning
@@ -298,17 +296,12 @@ IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox
pAntiImpl->EndDialog(RET_OK);
return 0;
}
-IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox )
-
-
-IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile)
+IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile)
{
pAntiImpl->EndDialog(RET_TEMPLATE_LOAD);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, LoadFile)
-
sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
{
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index f0b127a..2e86883 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -47,15 +47,12 @@ void SfxHintPoster::Post( SfxHint* pHintToPost )
-IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
+IMPL_LINK( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
{
Event( pPostedHint );
ReleaseRef();
return 0;
}
-IMPL_LINK_INLINE_END( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
-
-
void SfxHintPoster::Event( SfxHint* pPostedHint )
{
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index f562685..80d3917 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -149,13 +149,11 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
/**************************************************************************/
-IMPL_LINK_INLINE_START( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMPTYARG/*pButton*/ )
+IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMPTYARG/*pButton*/ )
{
m_pZoom->Enable(m_pSizeZoomed->IsChecked());
return 0;
}
-IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButton )
-
SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions)
: SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", &rOptions)
@@ -288,14 +286,12 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
SetTextColor( aTxtColor );
}
-IMPL_LINK_INLINE_START( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
+IMPL_LINK( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
{
Face.SetName(pComboBox->GetText());
m_pShowFont->SetFont(Face);
return 0;
}
-IMPL_LINK_INLINE_END( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
-
IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
{
@@ -557,7 +553,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
}
-IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
{
if (SaveDefaultsQuery(this).Execute() == RET_YES)
{
@@ -568,7 +564,6 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTY
}
return 0;
}
-IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, pButton )
SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntListDevice)
: ModalDialog(pParent, "FontsDialog", "modules/smath/ui/fonttypedialog.ui"),
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index cc04930..5e39c86 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -403,7 +403,7 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
}
-IMPL_LINK_INLINE_START( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
{
SmViewShell *pViewSh = rCmdBox.GetView();
if (pViewSh)
@@ -412,7 +412,6 @@ IMPL_LINK_INLINE_START( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
new SfxInt16Item(SID_INSERTCOMMAND, pMenu->GetCurItemId()), 0L);
return 0;
}
-IMPL_LINK_INLINE_END( SmEditWindow, MenuSelectHdl, Menu *, pMenu )
void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
{
@@ -587,7 +586,7 @@ IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, EMPTYARG /*pStat*/ )
}
}
-IMPL_LINK_INLINE_START( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScrollBar*/ )
+IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScrollBar*/ )
{
OSL_ENSURE(pEditView, "EditView missing");
if (pEditView)
@@ -599,7 +598,6 @@ IMPL_LINK_INLINE_START( SmEditWindow, ScrollHdl, ScrollBar *, EMPTYARG /*pScroll
}
return 0;
}
-IMPL_LINK_INLINE_END( SmEditWindow, ScrollHdl, ScrollBar *, pScrollBar )
Rectangle SmEditWindow::AdjustScrollBars()
{
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c967936..829b6af 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -606,15 +606,13 @@ void SmGraphicWindow::Command(const CommandEvent& rCEvt)
}
-IMPL_LINK_INLINE_START( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
{
SmViewShell *pViewSh = GetView();
if (pViewSh)
pViewSh->GetViewFrame()->GetDispatcher()->Execute( pMenu->GetCurItemId() );
return 0;
}
-IMPL_LINK_INLINE_END( SmGraphicWindow, MenuSelectHdl, Menu *, pMenu )
-
void SmGraphicWindow::SetZoom(sal_uInt16 Factor)
{
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 2f6cc7e..be2222c 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -520,14 +520,11 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt )
-IMPL_LINK_NOARG_INLINE_START(BrowserDataWin, RepeatedMouseMove)
+IMPL_LINK_NOARG(BrowserDataWin, RepeatedMouseMove)
{
GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(BrowserDataWin, RepeatedMouseMove)
-
-
void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt )
{
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 78b6809..7818856 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -300,7 +300,7 @@ void SvImpLBox::Clear()
// Paint, navigate, scroll
// *********************************************************************
-IMPL_LINK_NOARG_INLINE_START(SvImpLBox, EndScrollHdl)
+IMPL_LINK_NOARG(SvImpLBox, EndScrollHdl)
{
if( nFlags & F_ENDSCROLL_SET_VIS_SIZE )
{
@@ -310,8 +310,6 @@ IMPL_LINK_NOARG_INLINE_START(SvImpLBox, EndScrollHdl)
EndScroll();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvImpLBox, EndScrollHdl)
-
// handler for vertical scrollbar
@@ -725,7 +723,7 @@ void SvImpLBox::UpdateAll(
pView->Invalidate( GetVisibleArea() );
}
-IMPL_LINK_INLINE_START( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar )
+IMPL_LINK( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar )
{
long nDelta = pScrollBar->GetDelta();
if( nDelta )
@@ -740,7 +738,6 @@ IMPL_LINK_INLINE_START( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar )
}
return 0;
}
-IMPL_LINK_INLINE_END( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar )
void SvImpLBox::KeyLeftRight( long nDelta )
{
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index c8a7802..87f7214 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -180,22 +180,19 @@ void SvInplaceEdit2::Hide()
}
-IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, ReturnHdl_Impl)
+IMPL_LINK_NOARG(SvInplaceEdit2, ReturnHdl_Impl)
{
bCanceled = false;
CallCallBackHdl_Impl();
return 1;
}
-IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, ReturnHdl_Impl)
-IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, EscapeHdl_Impl)
+IMPL_LINK_NOARG(SvInplaceEdit2, EscapeHdl_Impl)
{
bCanceled = true;
CallCallBackHdl_Impl();
return 1;
}
-IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, EscapeHdl_Impl)
-
bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt )
{
@@ -239,12 +236,11 @@ void SvInplaceEdit2::LoseFocus()
}
}
-IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, Timeout_Impl)
+IMPL_LINK_NOARG(SvInplaceEdit2, Timeout_Impl)
{
CallCallBackHdl_Impl();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, Timeout_Impl)
void SvInplaceEdit2::CallCallBackHdl_Impl()
{
@@ -461,11 +457,10 @@ bool SvTreeListBox::IsEntryMnemonicsEnabled() const
return mpImpl->m_bEntryMnemonicsEnabled;
}
-IMPL_LINK_INLINE_START( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry )
+IMPL_LINK( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry )
{
return reinterpret_cast<sal_IntPtr>(CloneEntry((SvTreeListEntry*)pEntry));
}
-IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry )
sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry, SvTreeListEntry* pParent, sal_uLong nPos )
{
@@ -1816,13 +1811,12 @@ const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry
return pItem->GetBitmap1( );
}
-IMPL_LINK_INLINE_START( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData )
+IMPL_LINK( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData )
{
pHdlEntry = pData->GetActEntry();
CheckButtonHdl();
return 0;
}
-IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData )
SvTreeListEntry* SvTreeListBox::InsertEntry(
const OUString& rText,
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 7e3f5d4..713b9e9 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -740,12 +740,11 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SvxFontWorkDialog, ModifyInputHdl_Impl)
+IMPL_LINK_NOARG(SvxFontWorkDialog, ModifyInputHdl_Impl)
{
aInputIdle.Start();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxFontWorkDialog, ModifyInputHdl_Impl)
IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
{
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 4e002a8..6f21f6c 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -566,27 +566,24 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SvxHFPage, DistModify)
+IMPL_LINK_NOARG(SvxHFPage, DistModify)
{
UpdateExample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxHFPage, DistModify)
-IMPL_LINK_NOARG_INLINE_START(SvxHFPage, HeightModify)
+IMPL_LINK_NOARG(SvxHFPage, HeightModify)
{
UpdateExample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxHFPage, HeightModify)
-IMPL_LINK_NOARG_INLINE_START(SvxHFPage, BorderModify)
+IMPL_LINK_NOARG(SvxHFPage, BorderModify)
{
UpdateExample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SvxHFPage, BorderModify)
IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
{
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 3c12829..1a8f6d9 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3426,13 +3426,12 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
}
-IMPL_LINK_INLINE_START( SvxRuler, MenuSelect, Menu *, pMenu )
+IMPL_LINK( SvxRuler, MenuSelect, Menu *, pMenu )
{
/* Handler of the context menus for switching the unit of measurement */
SetUnit(FieldUnit(pMenu->GetCurItemId()));
return 0;
}
-IMPL_LINK_INLINE_END( SvxRuler, MenuSelect, Menu *, pMenu )
IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
{
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index be1f748..71e917c 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -154,7 +154,7 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S
-IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
+IMPL_LINK( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
{
if ( !mpSmartTagItem )
return 0;
@@ -187,9 +187,6 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
return 0;
}
-IMPL_LINK_INLINE_END( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
-
-
SvxSmartTagsControl::~SvxSmartTagsControl()
{
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index d1f68db..3dd0995 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -134,16 +134,13 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint )
weiteren Fontinformationen mu\s durch die Applikation geschehen.
*/
-IMPL_LINK_INLINE_START( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
+IMPL_LINK( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
{
SvxFontItem aItem( GetId() );
aItem.SetFamilyName(pMen->GetCurName());
GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L );
return 0;
}
-IMPL_LINK_INLINE_END( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
-
-
/* [Beschreibung]
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 59c0fbb..dfc7d21 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -293,7 +293,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
-IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl)
+IMPL_LINK_NOARG(SdrPaintView, ImpComeBackHdl)
{
if (bSomeObjChgdFlag) {
bSomeObjChgdFlag=false;
@@ -301,7 +301,6 @@ IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl)
}
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SdrPaintView,ImpComeBackHdl)
void SdrPaintView::FlushComeBackTimer() const
{
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index d0dea5f..7026d43 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -59,15 +59,14 @@ void SwBreakDlg::Apply()
}
}
-IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, ClickHdl)
+IMPL_LINK_NOARG(SwBreakDlg, ClickHdl)
{
CheckEnable();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, ClickHdl)
// Handler for Change Page Number
-IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
+IMPL_LINK( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
{
if(pBox->IsChecked())
m_pPageNumEdit->SetValue(1);
@@ -75,15 +74,13 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
m_pPageNumEdit->SetText(OUString());
return 0;
}
-IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
// By changing the Page number the checkbox is checked.
-IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl)
+IMPL_LINK_NOARG(SwBreakDlg, PageNumModifyHdl)
{
m_pPageNumBox->Check();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, PageNumModifyHdl)
/*
* Ok-Handler;
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 0e024ab..691023c2 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -759,13 +759,12 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl)
+IMPL_LINK_NOARG(SwDropCapsPage, SelectHdl)
{
m_pPict->UpdatePaintSettings();
bModified = true;
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwDropCapsPage, SelectHdl)
void SwDropCapsPage::FillSet( SfxItemSet &rSet )
{
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 84cf08a..9764b8f 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -843,12 +843,11 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwCaptionOptPage, SelectHdl)
+IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl)
{
DrawSample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwCaptionOptPage, SelectHdl)
IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
{
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 287429b..4b02931 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -503,7 +503,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* )
m_pProspectCB_RTL->Enable( false );
}
-IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl)
{
bAttrModified = true;
bool bIsProspect = m_pProspectCB->IsChecked();
@@ -517,7 +517,6 @@ IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl)
m_pInMarginsRB->Enable( !bIsProspect );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, AutoClickHdl)
void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
{
@@ -529,12 +528,11 @@ void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
m_pFaxLB->SelectEntryPos(0);
}
-IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, SelectHdl)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl)
{
bAttrModified=true;
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwAddPrinterTabPage, SelectHdl)
void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
{
@@ -2603,12 +2601,11 @@ void SwTestTabPage::Init()
m_pTest10CBox->SetClickHdl( aLk );
}
-IMPL_LINK_NOARG_INLINE_START(SwTestTabPage, AutoClickHdl)
+IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl)
{
bAttrModified = true;
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwTestTabPage, AutoClickHdl)
#endif
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index a6d8a92..65a40c8 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1744,14 +1744,13 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwInsertSectionTabPage, NameEditHdl)
+IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl)
{
const OUString aName = m_pCurName->GetText();
GetTabDialog()->GetOKButton().Enable(!aName.isEmpty() &&
m_pCurName->GetEntryPos( aName ) == LISTBOX_ENTRY_NOTFOUND);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwInsertSectionTabPage, NameEditHdl)
IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
{
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 0fa73fb..96c7e92 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -218,7 +218,7 @@ void SwEnvFmtPage::dispose()
}
-IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
+IMPL_LINK( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
{
long lWVal = static_cast< long >(GetFldVal(*m_pSizeWidthField ));
long lHVal = static_cast< long >(GetFldVal(*m_pSizeHeightField));
@@ -253,7 +253,6 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
}
return 0;
}
-IMPL_LINK_INLINE_END( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
{
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 8cf4721..267186e 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -365,12 +365,11 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwLabPage, PageHdl)
+IMPL_LINK_NOARG(SwLabPage, PageHdl)
{
m_pMakeBox->GetSelectHdl().Call(m_pMakeBox);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwLabPage, PageHdl)
IMPL_LINK_NOARG(SwLabPage, MakeHdl)
{
@@ -426,13 +425,12 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwLabPage, TypeHdl)
+IMPL_LINK_NOARG(SwLabPage, TypeHdl)
{
DisplayFormat();
aItem.aType = m_pTypeBox->GetSelectEntry();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwLabPage, TypeHdl)
void SwLabPage::DisplayFormat()
{
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 92e77b9..4a73392 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -377,16 +377,15 @@ void SwLabFmtPage::dispose()
// Modify-handler of MetricFields. start preview timer
-IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, ModifyHdl)
+IMPL_LINK_NOARG(SwLabFmtPage, ModifyHdl)
{
bModified = true;
aPreviewIdle.Start();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, ModifyHdl)
// Invalidate preview
-IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, PreviewHdl)
+IMPL_LINK_NOARG(SwLabFmtPage, PreviewHdl)
{
aPreviewIdle.Stop();
ChangeMinMax();
@@ -395,16 +394,14 @@ IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, PreviewHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, PreviewHdl)
// LoseFocus-Handler: Update on change
-IMPL_LINK_INLINE_START( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
+IMPL_LINK( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
{
if (static_cast<Edit*>( pControl)->IsModified())
PreviewHdl(0);
return 0;
}
-IMPL_LINK_INLINE_END( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
void SwLabFmtPage::ChangeMinMax()
{
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 7df369a..ac5e749 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -110,7 +110,7 @@ void SwJavaEditDialog::dispose()
SvxStandardDialog::dispose();
}
-IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
+IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl)
{
pSh->EnterStdMode();
@@ -122,9 +122,8 @@ IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, PrevHdl)
-IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl)
+IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl)
{
pSh->EnterStdMode();
@@ -136,7 +135,6 @@ IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, NextHdl)
IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl)
{
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 719af75..b43f86f 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -280,7 +280,7 @@ void SwCaptionDialog::Apply()
our_aSepTextSave = m_pSepEdit->GetText();
}
-IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton )
+IMPL_LINK( SwCaptionDialog, OptionHdl, Button*, pButton )
{
OUString sFldTypeName = m_pCategoryBox->GetText();
if(sFldTypeName == m_sNone)
@@ -302,14 +302,12 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton )
DrawSample();
return 0;
}
-IMPL_LINK_INLINE_END( SwCaptionDialog, OptionHdl, Button*, pButton )
-IMPL_LINK_NOARG_INLINE_START(SwCaptionDialog, SelectHdl)
+IMPL_LINK_NOARG(SwCaptionDialog, SelectHdl)
{
DrawSample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwCaptionDialog, SelectHdl)
IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl)
{
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 1f35779..5fa3585 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2081,7 +2081,7 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwFrmPage, RealSizeHdl)
+IMPL_LINK_NOARG(SwFrmPage, RealSizeHdl)
{
m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(aGrfSize.Width() ), FUNIT_TWIP);
m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(aGrfSize.Height()), FUNIT_TWIP);
@@ -2089,7 +2089,6 @@ IMPL_LINK_NOARG_INLINE_START(SwFrmPage, RealSizeHdl)
UpdateExample();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwFrmPage, RealSizeHdl)
IMPL_LINK_NOARG(SwFrmPage, AutoWidthClickHdl)
{
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index fe0d48b..8e8f90c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3812,7 +3812,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl)
+IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl)
{
const OUString aTmpName( m_pParaLayLB->GetSelectEntry() );
SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell();
@@ -3822,7 +3822,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl)
AssignHdl(m_pAssignBT);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwTOXStylesTabPage, DoubleClickHdl)
// enable only when selected
IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl)
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index 51cffac..17a7983 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -45,7 +45,7 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr)
m_pTextFT->SetText(rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName());
}
-IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
+IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
{
if(pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
{ SwTOXMark* pMark = rMgr.GetTOXMark(pBox->GetSelectEntryPos());
@@ -54,7 +54,6 @@ IMPL_LINK_INLINE_START( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
}
return 0;
}
-IMPL_LINK_INLINE_END( SwMultiTOXMarkDlg, SelectHdl, ListBox *, pBox )
void SwMultiTOXMarkDlg::Apply()
{
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index cb68df2..5d31733 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -702,34 +702,31 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox )
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, NextHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, NextHdl)
{
InsertUpdate();
pTOXMgr->NextTOXMark();
UpdateDialog();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, NextHdl)
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, NextSameHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, NextSameHdl)
{
InsertUpdate();
pTOXMgr->NextTOXMark(true);
UpdateDialog();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, NextSameHdl)
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, PrevHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, PrevHdl)
{
InsertUpdate();
pTOXMgr->PrevTOXMark();
UpdateDialog();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, PrevHdl)
-IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, PrevSameHdl)
+IMPL_LINK_NOARG(SwIndexMarkPane, PrevSameHdl)
{
InsertUpdate();
pTOXMgr->PrevTOXMark(true);
@@ -737,7 +734,6 @@ IMPL_LINK_NOARG_INLINE_START(SwIndexMarkPane, PrevSameHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwIndexMarkPane, PrevSameHdl)
IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl)
{
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 04467a3..81cf7bd 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -328,7 +328,7 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl)
// Handler behind the button to collect the footnote at the chapter or end of
// the document. In this case no pagewise numbering can be used.
-IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl)
+IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl)
{
if ( !bPosDoc )
SelectNumbering(FTNNUM_DOC);
@@ -340,7 +340,6 @@ IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl)
m_pPageTemplBox->Enable();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwEndNoteOptionPage, PosChapterHdl)
static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFmtName )
{
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 3664343d..b1413b3 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -410,14 +410,13 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit )
return 0;
}
-IMPL_LINK_INLINE_START( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
+IMPL_LINK( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
{
SvTreeListEntry* pEntry = pBox->FirstSelected();
if(pBox->GetParent(pEntry) && !bIsDocReadOnly)
EndDialog( RET_OK );
return 0;
}
-IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox )
IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn )
{
@@ -784,7 +783,7 @@ void SwGlossaryDlg::Init()
m_pInsertTipCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
}
-IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl)
+IMPL_LINK_NOARG(SwGlossaryDlg, EditHdl)
{
// EndDialog must not be called in MenuHdl
if (m_pEditBtn->GetCurItemIdent() == "edit")
@@ -795,7 +794,6 @@ IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl)
}
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwGlossaryDlg, EditHdl)
// KeyInput for ShortName - Edits without Spaces
IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 0824f3d..d3f3c086 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -82,29 +82,26 @@ void SwInsFootNoteDlg::Apply()
bFootnote = m_pFtnBtn->IsChecked();
}
-IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberCharHdl)
+IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberCharHdl)
{
m_pNumberCharEdit->GrabFocus();
m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() || bExtCharAvailable );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberCharHdl)
-IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberEditHdl)
+IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl)
{
m_pNumberCharBtn->Check( true );
m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberEditHdl)
-IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberAutoBtnHdl)
+IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberAutoBtnHdl)
{
m_pOkBtn->Enable( true );
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberAutoBtnHdl)
IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl)
{
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f2a15a3..679cdcb 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -92,13 +92,12 @@ void SwNumNamesDlg::dispose()
// remember selected entry
-IMPL_LINK_INLINE_START( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
+IMPL_LINK( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
{
m_pFormEdit->SetText(pBox->GetSelectEntry());
m_pFormEdit->SetSelection(Selection(0, SELECTION_MAX));
return 0;
}
-IMPL_LINK_INLINE_END( SwNumNamesDlg, SelectHdl, ListBox *, pBox )
/** set user defined names
*
@@ -122,20 +121,18 @@ void SwNumNamesDlg::SetUserNames(const OUString *pList[])
}
// unlock OK-Button when text is in Edit
-IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
+IMPL_LINK( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
{
m_pOKBtn->Enable(!pBox->GetText().isEmpty());
return 0;
}
-IMPL_LINK_INLINE_END( SwNumNamesDlg, ModifyHdl, Edit *, pBox )
// DoubleClickHdl
-IMPL_LINK_NOARG_INLINE_START(SwNumNamesDlg, DoubleClickHdl)
+IMPL_LINK_NOARG(SwNumNamesDlg, DoubleClickHdl)
{
EndDialog(RET_OK);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwNumNamesDlg, DoubleClickHdl)
SwNumNamesDlg::SwNumNamesDlg(vcl::Window *pParent)
: ModalDialog(pParent, "NumberingNameDialog",
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index bd8b008..43a0135 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -52,20 +52,18 @@ const sal_uInt16 SwFootNotePage::aPageRg[] = {
// handler to switch between the different possibilities how the footnote
// region's height can be set.
-IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage)
+IMPL_LINK_NOARG(SwFootNotePage, HeightPage)
{
m_pMaxHeightEdit->Enable(false);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightPage)
-IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightMetric)
+IMPL_LINK_NOARG(SwFootNotePage, HeightMetric)
{
m_pMaxHeightEdit->Enable();
m_pMaxHeightEdit->GrabFocus();
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightMetric)
// handler limit values
IMPL_LINK_NOARG(SwFootNotePage, HeightModify)
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 50ffa47..1ab303f 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -31,7 +31,7 @@
#include <cmdid.h>
#include <table.hrc>
-IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
+IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl)
{
sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1;
const SwTwips lWidth = rFnc.GetColWidth(nId);
@@ -39,7 +39,6 @@ IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl)
m_pWidthMF->SetValue(m_pWidthMF->Normalize(lWidth), FUNIT_TWIP);
return 0;
}
-IMPL_LINK_NOARG_INLINE_END(SwTableWidthDlg, LoseFocusHdl)
SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc )
: SvxStandardDialog( pParent, "ColumnWidthDialog", "modules/swriter/ui/columnwidth.ui" )
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index e673194..0a24fe5 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -157,7 +157,7 @@ void SwInsTableDlg::dispose()
SfxModalDialog::dispose();
}
-IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
+IMPL_LINK( SwInsTableDlg, ModifyName, Edit *, pEdit )
{
OUString sTblName = pEdit->GetText();
if (sTblName.indexOf(' ') != -1)
@@ -169,7 +169,6 @@ IMPL_LINK_INLINE_START( SwInsTableDlg, ModifyName, Edit *, pEdit )
m_pInsertBtn->Enable(pShell->GetTblStyle( sTblName ) == 0);
return 0;
}
-IMPL_LINK_INLINE_END( SwInsTableDlg, ModifyName, Edit *, pEdit )
IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField )
{
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index a90e84c..00ee902 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -285,14 +285,13 @@ void SwFormatTablePage::RightModify()
}
}
-IMPL_LINK_INLINE_START( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
+IMPL_LINK( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
{
if( m_aRightMF.get() == pEdit)
RightModify();
ModifyHdl( pEdit );
return 0;
}
-IMPL_LINK_INLINE_END( SwFormatTablePage, UpDownLoseFocusHdl, MetricField *, pEdit )
void SwFormatTablePage::ModifyHdl(const Edit * pEdit)
{
@@ -906,23 +905,21 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl )
return 0;
}
-IMPL_LINK_INLINE_START( SwTableColumnPage, UpHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, UpHdl, MetricField*, pEdit )
{
bModified = true;
ModifyHdl( pEdit );
return 0;
}
-IMPL_LINK_INLINE_END( SwTableColumnPage, UpHdl, MetricField*, pEdit )
-IMPL_LINK_INLINE_START( SwTableColumnPage, DownHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, DownHdl, MetricField*, pEdit )
{
bModified = true;
ModifyHdl( pEdit );
return 0;
}
-IMPL_LINK_INLINE_END( SwTableColumnPage, DownHdl, MetricField*, pEdit )
-IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
+IMPL_LINK( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
{
if (pEdit->IsModified())
{
@@ -931,7 +928,6 @@ IMPL_LINK_INLINE_START( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
}
return 0;
}
-IMPL_LINK_INLINE_END( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit )
IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox )
{
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index a60439c..5ff495d 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -502,14 +502,13 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFmtHdl)
return 0;
}
-IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl)
+IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl)
{
if( bSetAutoFmt )
pShell->SetTableAutoFmt( (*pTableTbl)[ nIndex ] );
EndDialog( RET_OK );
return sal_True;
}
-IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl)
AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent, WinBits nStyle) :
Window ( pParent, nStyle ),
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e2e4bfe..a9b95cf 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1528,13 +1528,12 @@ void SwDBManager::MergeCancel()
bCancel = true;
}
-IMPL_LINK_INLINE_START( SwDBManager, PrtCancelHdl, Button *, pButton )
+IMPL_LINK( SwDBManager, PrtCancelHdl, Button *, pButton )
{
pButton->GetParent()->Hide();
MergeCancel();
return 0;
}
-IMPL_LINK_INLINE_END( SwDBManager, PrtCancelHdl, Button *, pButton )
// determine the column's Numberformat and transfer to the forwarded Formatter,
// if applicable.
commit 17cb3391ece392497eeff4ed32cbf89b4bcb5825
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 28 15:14:04 2015 +0200
Remove unnecessary IMPL_LINK_INLINE macro
Change-Id: I81cbec049b98d2d2619b0480e0cf54bd1d7b6718
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 4f7e208..9f7149c 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -67,12 +67,11 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
return nDdeErrMap[ 2 * (nErr - DDE_FIRSTERR) + 1 ];
}
-IMPL_LINK_INLINE( SbiDdeControl,Data , DdeData*, pData,
+IMPL_LINK( SbiDdeControl,Data , DdeData*, pData )
{
aData = OUString::createFromAscii( static_cast<const char*>((const void*)*pData) );
return 1;
}
-)
SbiDdeControl::SbiDdeControl()
{
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index e7116a0..ea3a366 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -92,11 +92,6 @@ typedef sal_IntPtr (*PSTUB)( void*, void* );
#define IMPL_LINK_NOARG_INLINE_END( Class, Method ) \
IMPL_STUB( Class, Method, void* )
-#define IMPL_LINK_INLINE( Class, Method, ArgType, ArgName, Body ) \
- sal_IntPtr Class::Method( ArgType ArgName ) \
- Body \
- IMPL_STUB( Class, Method, ArgType )
-
#define EMPTYARG
class TOOLS_DLLPUBLIC Link
commit e6c08b6b302b00cc55e9963ce47d6cc2416049a6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 28 15:10:58 2015 +0200
Remove unnecessary STATIC_LINK macro
Change-Id: I4788824667c8e0d1d4e0717b7ae7737bb0fd2c90
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 43d1be3..646dd2f 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -358,7 +358,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
MacroExecutionData* pExecData = new MacroExecutionData;
pExecData->aDocument = aDocument;
pExecData->xMethod = pMethod; // keep alive until the event has been processed
- Application::PostUserEvent( STATIC_LINK( NULL, MacroExecution, ExecuteMacroEvent ), pExecData );
+ Application::PostUserEvent( LINK( NULL, MacroExecution, ExecuteMacroEvent ), pExecData );
}
}
break;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index fc5194a..9ca5201 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -723,14 +723,14 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
m_xModifiable = xModifiable;
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link aLnk(STATIC_LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
if( mpImpl->pAssignComponentPB )
mpImpl->pAssignComponentPB->SetClickHdl( aLnk );
- rListBox.SetDoubleClickHdl( STATIC_LINK(this, _SvxMacroTabPage, DoubleClickHdl_Impl ) );
+ rListBox.SetDoubleClickHdl( LINK(this, _SvxMacroTabPage, DoubleClickHdl_Impl ) );
- rListBox.SetSelectHdl( STATIC_LINK( this, _SvxMacroTabPage, SelectEvent_Impl ));
+ rListBox.SetSelectHdl( LINK( this, _SvxMacroTabPage, SelectEvent_Impl ));
rListBox.SetSelectionMode( SINGLE_SELECTION );
rListBox.SetTabs( &nTabs[0], MAP_APPFONT );
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 3b2a4c9..dc55f89 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -238,7 +238,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
//InitHdl wants to use virtual methods, so it
//can't be called during the ctor, so init
//it on next event cycle post-ctor
- Application::PostUserEvent( STATIC_LINK(
+ Application::PostUserEvent( LINK(
this, SpellDialog, InitHdl ) );
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 0b24ea2..22c3c27 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -556,7 +556,7 @@ void SfxInsertFloatingFrameDialog::Init()
get(m_pNMMarginHeight, "height");
get(m_pCBMarginHeightDefault, "defaultheight");
- Link aLink( STATIC_LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
+ Link aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
m_pCBMarginWidthDefault->SetClickHdl( aLink );
m_pCBMarginHeightDefault->SetClickHdl( aLink );
@@ -565,7 +565,7 @@ void SfxInsertFloatingFrameDialog::Init()
m_pRBScrollingAuto->Check();
m_pRBFrameBorderOn->Check();
- m_pBTOpen->SetClickHdl( STATIC_LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
+ m_pBTOpen->SetClickHdl( LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
}
short SfxInsertFloatingFrameDialog::Execute()
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4a98eb5..a12e68c 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -443,7 +443,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox
//! workaround to set the selection since calling SelectEntryPos within
//! the double click handler does not work
- Application::PostUserEvent( STATIC_LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox );
+ Application::PostUserEvent( LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox );
return 0;
}
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ced5718..9c384f0 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -197,7 +197,7 @@ void _SfxMacroTabPage::LaunchFillGroup()
{
if (!mpImpl->maFillGroupIdle.GetIdleHdl().IsSet())
{
- mpImpl->maFillGroupIdle.SetIdleHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
+ mpImpl->maFillGroupIdle.SetIdleHdl( LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
mpImpl->maFillGroupIdle.SetPriority( SchedulerPriority::HIGHEST );
mpImpl->maFillGroupIdle.Start();
}
@@ -369,15 +369,15 @@ void _SfxMacroTabPage::InitAndSetHandler()
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
rListBox.SetDoubleClickHdl( aLnk );
- rListBox.SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
- mpImpl->pGroupLB->SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectGroup_Impl ));
- mpImpl->pMacroLB->SetSelectHdl( STATIC_LINK( this, _SfxMacroTabPage, SelectMacro_Impl ));
+ rListBox.SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
+ mpImpl->pGroupLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectGroup_Impl ));
+ mpImpl->pMacroLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectMacro_Impl ));
rListBox.SetSelectionMode( SINGLE_SELECTION );
rListBox.SetTabs( &nTabs[0], MAP_APPFONT );
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f6a6b3f..bdc91ac 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -316,7 +316,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
}
SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH);
- pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
+ pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
@@ -409,7 +409,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
SdrObject::Free(pObj);
SvxBrushItem* pBrushItem = new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH);
- pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
+ pBrushItem->SetDoneLink(LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index b3e5330..d87980f 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list