mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove _TYPED suffix from tools/link.hxx macros

Browse Source 
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.

Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
This commit is contained in:
Stephan Bergmann 2016-10-05 07:56:12 +02:00
parent 36efdec23b
commit 106ea87205
1865 changed files with 7127 additions and 7127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/inc/extended/accessibletabbarbase.hxx
View File

@ -40,7 +40,7 @@ public:
virtual ~AccessibleTabBarBase() override;
protected:
DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );

2
accessibility/inc/extended/accessibletablistboxtable.hxx
View File

@ -41,7 +41,7 @@ private:
css::uno::Reference< css::accessibility::XAccessible > m_xCurChild;
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
// helpers ----------------------------------------------------------------

2
accessibility/inc/extended/listboxaccessible.hxx
View File

@ -68,7 +68,7 @@ namespace accessibility
void disposing();
private:
DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
private:
ListBoxAccessibleBase( const ListBoxAccessibleBase& ) = delete;

2
accessibility/inc/extended/textwindowaccessibility.hxx
View File

@ -579,7 +579,7 @@ private:
// Assuming that this will only be called with the external (Solar) mutex
// locked.
// init will already have been called.
DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void);
DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
// Must be called with both the external (Solar) and internal mutex
// locked.

2
accessibility/inc/standard/accessiblemenubasecomponent.hxx
View File

@ -110,7 +110,7 @@ protected:
virtual void Click();
virtual bool IsPopupMenuOpen();
DECL_LINK_TYPED( MenuEventListener, VclMenuEvent&, void );
DECL_LINK( MenuEventListener, VclMenuEvent&, void );
void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent );

2
accessibility/inc/standard/vclxaccessiblemenubar.hxx
View File

@ -38,7 +38,7 @@ protected:
virtual bool IsFocused() override;
DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );

2
accessibility/source/extended/accessibletabbarbase.cxx
View File

@ -43,7 +43,7 @@ AccessibleTabBarBase::~AccessibleTabBarBase()
DELETEZ( m_pExternalLock );
}
IMPL_LINK_TYPED( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, void )
IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, void )
{
vcl::Window* pEventWindow = rEvent.GetWindow();
OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );

2
accessibility/source/extended/accessibletablistboxtable.cxx
View File

@ -251,7 +251,7 @@ namespace accessibility
}
}
IMPL_LINK_TYPED( AccessibleTabListBoxTable, WindowEventListener, VclWindowEvent&, rEvent, void )
IMPL_LINK( AccessibleTabListBoxTable, WindowEventListener, VclWindowEvent&, rEvent, void )
{
OSL_ENSURE( rEvent.GetWindow() && m_pTabListBox, "no event window" );
ProcessWindowEvent( rEvent );

2
accessibility/source/extended/listboxaccessible.cxx
View File

@ -41,7 +41,7 @@ namespace accessibility
}
}
IMPL_LINK_TYPED( ListBoxAccessibleBase, WindowEventListener, VclWindowEvent&, rEvent, void )
IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclWindowEvent&, rEvent, void )
{
OSL_ENSURE( rEvent.GetWindow() , "ListBoxAccessibleBase::WindowEventListener: no event window!" );
OSL_ENSURE( rEvent.GetWindow() == m_pWindow, "ListBoxAccessibleBase::WindowEventListener: where did this come from?" );

2
accessibility/source/extended/textwindowaccessibility.cxx
View File

@ -1625,7 +1625,7 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint)
}
}
IMPL_LINK_TYPED(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
{
switch (rEvent.GetId())
{

2
accessibility/source/standard/accessiblemenubasecomponent.cxx
View File

@ -529,7 +529,7 @@ bool OAccessibleMenuBaseComponent::IsPopupMenuOpen()
}
IMPL_LINK_TYPED( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void )
IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void )
{
OSL_ENSURE( rEvent.GetMenu(), "OAccessibleMenuBaseComponent - Menu?" );
ProcessMenuEvent( rEvent );

2
accessibility/source/standard/vclxaccessiblemenubar.cxx
View File

@ -69,7 +69,7 @@ bool VCLXAccessibleMenuBar::IsFocused()
}
IMPL_LINK_TYPED( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void )
IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void )
{
OSL_ENSURE( rEvent.GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" );
if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) )

12
avmedia/inc/mediacontrol.hxx
View File

@ -64,12 +64,12 @@ protected:
private:
DECL_LINK_TYPED( implTimeHdl, Slider*, void );
DECL_LINK_TYPED( implTimeEndHdl, Slider*, void );
DECL_LINK_TYPED( implVolumeHdl, Slider*, void );
DECL_LINK_TYPED( implSelectHdl, ToolBox*, void );
DECL_LINK_TYPED( implZoomSelectHdl, ListBox&, void );
DECL_LINK_TYPED(implTimeoutHdl, Idle *, void);
DECL_LINK( implTimeHdl, Slider*, void );
DECL_LINK( implTimeEndHdl, Slider*, void );
DECL_LINK( implVolumeHdl, Slider*, void );
DECL_LINK( implSelectHdl, ToolBox*, void );
DECL_LINK( implZoomSelectHdl, ListBox&, void );
DECL_LINK(implTimeoutHdl, Idle *, void);
Idle maIdle;
MediaItem maItem;

12
avmedia/source/framework/mediacontrol.cxx
View File

@ -255,7 +255,7 @@ void MediaControl::setState( const MediaItem& rItem )
}
}
IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
IMPL_LINK( MediaControl, implTimeHdl, Slider*, p, void )
{
mbLocked = true;
maIdle.Stop();
@ -263,7 +263,7 @@ IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void )
}
IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p, void )
{
MediaItem aExecItem;
@ -275,7 +275,7 @@ IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void )
}
IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p, void )
{
MediaItem aExecItem;
@ -285,7 +285,7 @@ IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
}
IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void )
{
if( p )
{
@ -321,7 +321,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void )
}
IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void )
{
MediaItem aExecItem;
css::media::ZoomLevel eLevel;
@ -343,7 +343,7 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void )
}
IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
IMPL_LINK_NOARG(MediaControl, implTimeoutHdl, Idle *, void)
{
update();
}

2
avmedia/source/framework/soundhandler.cxx
View File

@ -298,7 +298,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
@return 0 every time... it doesn't matter for us.
@threadsafe yes
*//*-*************************************************************************************************************/
IMPL_LINK_NOARG_TYPED(SoundHandler, implts_PlayerNotify, Idle *, void)
IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Idle *, void)
{
// SAFE {
::osl::ClearableMutexGuard aLock( m_aLock );

2
avmedia/source/framework/soundhandler.hxx
View File

@ -110,7 +110,7 @@ class SoundHandler : // interfaces
// private methods
private:
DECL_LINK_TYPED( implts_PlayerNotify, Idle*, void );
DECL_LINK( implts_PlayerNotify, Idle*, void );
// variables
// (should be private everyway!)

4
avmedia/source/gstreamer/gstplayer.cxx
View File

@ -102,7 +102,7 @@ public:
private:
void processQueue();
DECL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void*, void);
DECL_STATIC_LINK(MissingPluginInstaller, launchUi, void*, void);
osl::Mutex mutex_;
std::set<OString> reported_;
@ -235,7 +235,7 @@ void MissingPluginInstaller::processQueue() {
}
IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void)
IMPL_STATIC_LINK(MissingPluginInstaller, launchUi, void *, p, void)
{
MissingPluginInstallerThread* thread = static_cast<MissingPluginInstallerThread*>(p);
rtl::Reference<MissingPluginInstallerThread> ref(thread, SAL_NO_ACQUIRE);

2
avmedia/source/opengl/oglplayer.cxx
View File

@ -358,7 +358,7 @@ uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames()
return { "com.sun.star.media.Player_OpenGL" };
}
IMPL_LINK_TYPED(OGLPlayer,TimerHandler,Timer*,pTimer,void)
IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer,void)
{
if (pTimer == &m_aTimer)
{

2
avmedia/source/opengl/oglplayer.hxx
View File

@ -61,7 +61,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
private:
DECL_LINK_TYPED( TimerHandler, Timer*, void );
DECL_LINK( TimerHandler, Timer*, void );
OUString m_sURL;

4
avmedia/source/opengl/oglwindow.cxx
View File

@ -199,7 +199,7 @@ void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintL
{
}
IMPL_LINK_TYPED(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
{
if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
{
@ -225,7 +225,7 @@ IMPL_LINK_TYPED(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
}
}
IMPL_LINK_TYPED(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void)
{
if( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT )
{

4
avmedia/source/opengl/oglwindow.hxx
View File

@ -62,8 +62,8 @@ public:
virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
private:
DECL_LINK_TYPED( FocusGrabber, VclWindowEvent&, void );
DECL_LINK_TYPED( CameraHandler, VclWindowEvent&, void );
DECL_LINK( FocusGrabber, VclWindowEvent&, void );
DECL_LINK( CameraHandler, VclWindowEvent&, void );
libgltf::glTFHandle& m_rHandle;
rtl::Reference<OpenGLContext> m_xContext;

2
basctl/source/accessibility/accessibledialogwindow.cxx
View File

@ -328,7 +328,7 @@ void AccessibleDialogWindow::SortChildren()
}
IMPL_LINK_TYPED( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void )
IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void )
{
DBG_ASSERT(rEvent.GetWindow(), "AccessibleDialogWindow::WindowEventListener: no window!");
if (!rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || rEvent.GetId() == VCLEVENT_OBJECT_DYING)

16
basctl/source/basicide/baside2.hxx
View File

@ -88,7 +88,7 @@ private:
SyntaxHighlighter aHighlighter;
Idle aSyntaxIdle;
std::set<sal_uInt16> aSyntaxLineTable;
DECL_LINK_TYPED(SyntaxTimerHdl, Idle *, void);
DECL_LINK(SyntaxTimerHdl, Idle *, void);
// progress bar
class ProgressInfo;
@ -233,10 +233,10 @@ protected:
virtual void Resize() override;
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK_TYPED(TreeListHdl, SvTreeListBox*, void);
DECL_LINK_TYPED( implEndDragHdl, HeaderBar *, void );
DECL_LINK_TYPED( EditAccHdl, Accelerator&, void );
DECL_LINK( ButtonHdl, Button *, void );
DECL_LINK(TreeListHdl, SvTreeListBox*, void);
DECL_LINK( implEndDragHdl, HeaderBar *, void );
DECL_LINK( EditAccHdl, Accelerator&, void );
public:
@ -281,7 +281,7 @@ private:
protected:
virtual void Resize() override;
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_LINK( ScrollHdl, ScrollBar*, void );
public:
explicit ComplexEditorWindow( ModulWindow* pParent );
@ -494,8 +494,8 @@ public:
virtual void dispose() override;
void InsertSelectedEntry(); //insert the selected entry
DECL_LINK_TYPED(ImplDoubleClickHdl, ListBox&, void);
DECL_LINK_TYPED(ImplSelectHdl, ListBox&, void);
DECL_LINK(ImplDoubleClickHdl, ListBox&, void);
DECL_LINK(ImplSelectHdl, ListBox&, void);
protected:
virtual void KeyInput( const KeyEvent& rKeyEvt ) override;

16
basctl/source/basicide/baside2b.cxx
View File

@ -1272,7 +1272,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
}
}
IMPL_LINK_NOARG_TYPED(EditorWindow, SyntaxTimerHdl, Idle *, void)
IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Idle *, void)
{
DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" );
@ -1762,21 +1762,21 @@ void WatchWindow::RemoveSelectedWatch()
}
IMPL_LINK_TYPED( WatchWindow, ButtonHdl, Button *, pButton, void )
IMPL_LINK( WatchWindow, ButtonHdl, Button *, pButton, void )
{
if (pButton == aRemoveWatchButton.get())
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH);
}
IMPL_LINK_NOARG_TYPED(WatchWindow, TreeListHdl, SvTreeListBox*, void)
IMPL_LINK_NOARG(WatchWindow, TreeListHdl, SvTreeListBox*, void)
{
SvTreeListEntry* pCurEntry = aTreeListBox->GetCurEntry();
if ( pCurEntry && pCurEntry->GetUserData() )
aXEdit->SetText( static_cast<WatchItem*>(pCurEntry->GetUserData())->maName );
}
IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void )
IMPL_LINK_NOARG( WatchWindow, implEndDragHdl, HeaderBar *, void )
{
const sal_Int32 TAB_WIDTH_MIN = 10;
sal_Int32 nMaxWidth =
@ -1806,7 +1806,7 @@ IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void )
}
}
IMPL_LINK_TYPED( WatchWindow, EditAccHdl, Accelerator&, rAcc, void )
IMPL_LINK( WatchWindow, EditAccHdl, Accelerator&, rAcc, void )
{
switch ( rAcc.GetCurKeyCode().GetCode() )
{
@ -2028,7 +2028,7 @@ void ComplexEditorWindow::Resize()
aEWVScrollBar->SetPosSizePixel( Point( aOutSz.Width() - DWBORDER - nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) );
}
IMPL_LINK_TYPED(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
IMPL_LINK(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
{
if (aEdtWindow->GetEditView())
{
@ -2616,12 +2616,12 @@ void CodeCompleteListBox::dispose()
ListBox::dispose();
}
IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void)
IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void)
{
InsertSelectedEntry();
}
IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplSelectHdl, ListBox&, void)
IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl, ListBox&, void)
{//give back the focus to the parent
pCodeCompleteWindow->pParent->GrabFocus();
}

2
basctl/source/basicide/baside3.cxx
View File

@ -217,7 +217,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
}
IMPL_STATIC_LINK_TYPED(
IMPL_STATIC_LINK(
DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, pUndoAction, void )
{
// #i120515# pUndoAction needs to be deleted, this hand over is an ownership

2
basctl/source/basicide/basidesh.cxx
View File

@ -437,7 +437,7 @@ void Shell::OuterResizePixel( const Point &rPos, const Size &rSize )
}
IMPL_LINK_TYPED( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void )
IMPL_LINK( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void )
{
sal_uInt16 nCurId = pCurTabBar->GetCurPageId();
BaseWindow* pWin = aWindowTable[ nCurId ];

4
basctl/source/basicide/basobj2.cxx
View File

@ -209,10 +209,10 @@ namespace
class MacroExecution
{
public:
DECL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, void );
DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, void*, void );
};
IMPL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, p, void )
IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, void*, p, void )
{
MacroExecutionData* i_pData = static_cast<MacroExecutionData*>(p);
ENSURE_OR_RETURN_VOID( i_pData, "wrong MacroExecutionData" );

6
basctl/source/basicide/bastype3.hxx
View File

@ -34,9 +34,9 @@ private:
Link<ExtendedEdit*,void> aLoseFocusHdl;
protected:
DECL_LINK_TYPED( EditAccHdl, Accelerator&, void );
DECL_LINK_TYPED( ImplGetFocusHdl, Control&, void );
DECL_LINK_TYPED( ImplLoseFocusHdl, Control&, void );
DECL_LINK( EditAccHdl, Accelerator&, void );
DECL_LINK( ImplGetFocusHdl, Control&, void );
DECL_LINK( ImplLoseFocusHdl, Control&, void );
public:
ExtendedEdit( vcl::Window* pParent, IDEResId nRes );

8
basctl/source/basicide/bastypes.cxx
View File

@ -90,7 +90,7 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll )
}
IMPL_LINK_TYPED( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
IMPL_LINK( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
{
DoScroll( pCurScrollBar );
}
@ -426,20 +426,20 @@ ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) :
Control::SetLoseFocusHdl( LINK( this, ExtendedEdit, ImplLoseFocusHdl ) );
}
IMPL_LINK_NOARG_TYPED(ExtendedEdit, ImplGetFocusHdl, Control&, void)
IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl, Control&, void)
{
Application::InsertAccel( &aAcc );
aLoseFocusHdl.Call( this );
}
IMPL_LINK_NOARG_TYPED(ExtendedEdit, ImplLoseFocusHdl, Control&, void)
IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl, Control&, void)
{
Application::RemoveAccel( &aAcc );
}
IMPL_LINK_TYPED( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void )
IMPL_LINK( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void )
{
aAccHdl.Call( rAcc );
}

8
basctl/source/basicide/brkdlg.cxx
View File

@ -149,7 +149,7 @@ void BreakPointDialog::CheckButtons()
}
}
IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
IMPL_LINK( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
{
::CheckBox * pChkBx = static_cast<::CheckBox*>(pButton);
BreakPoint* pBrk = GetSelectedBreakPoint();
@ -157,7 +157,7 @@ IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
pBrk->bEnabled = pChkBx->IsChecked();
}
IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
{
m_pNewButton->Disable();
m_pOKButton->Enable();
@ -170,7 +170,7 @@ IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
}
IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
{
if (&rEdit == m_pComboBox)
CheckButtons();
@ -183,7 +183,7 @@ IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
}
IMPL_LINK_TYPED( BreakPointDialog, ButtonHdl, Button *, pButton, void )
IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton, void )
{
if (pButton == m_pOKButton)
{

8
basctl/source/basicide/brkdlg.hxx
View File

@ -43,10 +43,10 @@ private:
protected:
void CheckButtons();
DECL_LINK_TYPED( CheckBoxHdl, Button*, void );
DECL_LINK_TYPED( ComboBoxHighlightHdl, ComboBox&, void );
DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
DECL_LINK_TYPED( ButtonHdl, Button*, void );
DECL_LINK( CheckBoxHdl, Button*, void );
DECL_LINK( ComboBoxHighlightHdl, ComboBox&, void );
DECL_LINK( EditModifyHdl, Edit&, void );
DECL_LINK( ButtonHdl, Button*, void );
void UpdateFields( BreakPoint* pBrk );
BreakPoint* GetSelectedBreakPoint();

2
basctl/source/basicide/iderdll.cxx
View File

@ -170,7 +170,7 @@ void ExtraData::SetSearchItem (const SvxSearchItem& rItem)
pSearchItem.reset(static_cast<SvxSearchItem*>(rItem.Clone()));
}
IMPL_STATIC_LINK_TYPED(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic, sal_uInt16)
IMPL_STATIC_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic, sal_uInt16)
{
sal_uInt16 nRet = 0;
if (Shell* pShell = GetShell())

2
basctl/source/basicide/iderdll2.hxx
View File

@ -48,7 +48,7 @@ private:
bool bShellInCriticalSection;
protected:
DECL_STATIC_LINK_TYPED( ExtraData, GlobalBasicBreakHdl, StarBASIC *, sal_uInt16 );
DECL_STATIC_LINK( ExtraData, GlobalBasicBreakHdl, StarBASIC *, sal_uInt16 );
public:
ExtraData();

2
basctl/source/basicide/layout.cxx
View File

@ -362,7 +362,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect)
}
}
IMPL_LINK_TYPED(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter, void)
IMPL_LINK(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter, void)
{
// checking margins
CheckMarginsFor(pSplitter);

10
basctl/source/basicide/macrodlg.cxx
View File

@ -456,7 +456,7 @@ void MacroChooser::CheckButtons()
}
IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool)
IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool)
{
StoreMacroDescription();
if (nMode == Recording)
@ -470,7 +470,7 @@ IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool)
return false;
}
IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
{
// Is also called if deselected!
// Two function calls in every SelectHdl because
@ -483,7 +483,7 @@ IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
}
}
IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
{
// Is also called if deselected!
// Two function calls in every SelectHdl because
@ -533,7 +533,7 @@ IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
}
IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void )
IMPL_LINK_NOARG( MacroChooser, EditModifyHdl, Edit&, void )
{
// select the module in which the macro is put at Neu (new),
// if BasicManager or Lib is selecting
@ -590,7 +590,7 @@ IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void )
}
IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton, void )
{
// apart from New/Record the Description is done by LoseFocus
if (pButton == m_pRunButton)

10
basctl/source/basicide/macrodlg.hxx
View File

@ -67,11 +67,11 @@ private:
Mode nMode;
DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void );
DECL_LINK_TYPED( MacroDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void );
DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK( MacroSelectHdl, SvTreeListBox *, void );
DECL_LINK( MacroDoubleClickHdl, SvTreeListBox*, bool );
DECL_LINK( BasicSelectHdl, SvTreeListBox *, void );
DECL_LINK( EditModifyHdl, Edit&, void );
DECL_LINK( ButtonHdl, Button *, void );
void CheckButtons();
void SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry );

14
basctl/source/basicide/moduldl2.cxx
View File

@ -353,7 +353,7 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
}
// NewObjectDialog
IMPL_LINK_NOARG_TYPED(NewObjectDialog, OkButtonHandler, Button*, void)
IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler, Button*, void)
{
if (IsValidSbxName(m_pEdit->GetText()))
EndDialog(1);
@ -435,7 +435,7 @@ sal_Int32 GotoLineDialog::GetLineNumber() const
return m_pEdit->GetText().toInt32();
}
IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void)
IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler, Button*, void)
{
if ( GetLineNumber() )
EndDialog(1);
@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void)
}
// ExportDialog
IMPL_LINK_NOARG_TYPED(ExportDialog, OkButtonHandler, Button*, void)
IMPL_LINK_NOARG(ExportDialog, OkButtonHandler, Button*, void)
{
mbExportAsPackage = m_pExportAsPackageButton->IsChecked();
EndDialog(1);
@ -607,19 +607,19 @@ void LibPage::DeactivatePage()
{
}
IMPL_LINK_TYPED( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void )
IMPL_LINK( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void )
{
if ( pBox->IsSelected( pBox->GetHdlEntry() ) )
CheckButtons();
}
IMPL_LINK_NOARG_TYPED( LibPage, BasicSelectHdl, ListBox&, void )
IMPL_LINK_NOARG( LibPage, BasicSelectHdl, ListBox&, void )
{
SetCurLib();
CheckButtons();
}
IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void )
{
if (pButton == m_pEditButton)
{
@ -707,7 +707,7 @@ IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
CheckButtons();
}
IMPL_LINK_TYPED( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool )
IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool )
{
bool bRet = false;

6
basctl/source/basicide/moduldlg.cxx
View File

@ -506,7 +506,7 @@ short OrganizeDialog::Execute()
return TabDialog::Execute();
}
IMPL_LINK_TYPED( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
{
sal_uInt16 nId = pTabCtrl->GetCurPageId();
@ -679,7 +679,7 @@ void ObjectPage::CheckButtons()
m_pDelButton->Disable();
}
IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void )
IMPL_LINK( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void )
{
if ( !pBox->IsSelected( pBox->GetHdlEntry() ) )
return;
@ -687,7 +687,7 @@ IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void )
CheckButtons();
}
IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void )
IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void )
{
if (pButton == m_pEditButton)
{

20
basctl/source/basicide/moduldlg.hxx
View File

@ -51,7 +51,7 @@ private:
VclPtr<Edit> m_pEdit;
VclPtr<OKButton> m_pOKButton;
DECL_LINK_TYPED(OkButtonHandler, Button*, void);
DECL_LINK(OkButtonHandler, Button*, void);
public:
NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false);
virtual ~NewObjectDialog() override;
@ -68,7 +68,7 @@ class GotoLineDialog : public ModalDialog
{
VclPtr<Edit> m_pEdit;
VclPtr<OKButton> m_pOKButton;
DECL_LINK_TYPED(OkButtonHandler, Button*, void);
DECL_LINK(OkButtonHandler, Button*, void);
public:
explicit GotoLineDialog(vcl::Window * pParent);
virtual ~GotoLineDialog() override;
@ -84,7 +84,7 @@ private:
bool mbExportAsPackage;
DECL_LINK_TYPED(OkButtonHandler, Button*, void);
DECL_LINK(OkButtonHandler, Button*, void);
public:
explicit ExportDialog( vcl::Window * pParent );
@ -178,7 +178,7 @@ public:
virtual short Execute() override;
DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void );
DECL_LINK( ActivatePageHdl, TabControl*, void );
};
class ObjectPage: public TabPage
@ -190,8 +190,8 @@ protected:
VclPtr<PushButton> m_pNewDlgButton;
VclPtr<PushButton> m_pDelButton;
DECL_LINK_TYPED( BasicBoxHighlightHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK( BasicBoxHighlightHdl, SvTreeListBox*, void );
DECL_LINK( ButtonHdl, Button *, void );
void CheckButtons();
bool GetSelection( ScriptDocument& rDocument, OUString& rLibName );
void DeleteCurrent();
@ -229,10 +229,10 @@ protected:
ScriptDocument m_aCurDocument;
LibraryLocation m_eCurLocation;
DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void );
DECL_LINK_TYPED( BasicSelectHdl, ListBox&, void );
DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK_TYPED( CheckPasswordHdl, SvxPasswordDialog *, bool );
DECL_LINK( TreeListHighlightHdl, SvTreeListBox *, void );
DECL_LINK( BasicSelectHdl, ListBox&, void );
DECL_LINK( ButtonHdl, Button *, void );
DECL_LINK( CheckPasswordHdl, SvxPasswordDialog *, bool );
void CheckButtons();
void DeleteCurrent();
void NewLib();

2
basctl/source/dlged/dlged.cxx
View File

@ -575,7 +575,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
}
IMPL_LINK_NOARG_TYPED(DlgEditor, MarkTimeout, Idle *, void)
IMPL_LINK_NOARG(DlgEditor, MarkTimeout, Idle *, void)
{
rLayout.UpdatePropertyBrowser();
}

2
basctl/source/dlged/dlgedfac.cxx
View File

@ -43,7 +43,7 @@ DlgEdFactory::~DlgEdFactory()
}
IMPL_LINK_TYPED( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
{
static bool bNeedsInit = true;
static uno::Reference< lang::XMultiServiceFactory > xDialogSFact;

2
basctl/source/dlged/dlgedfunc.cxx
View File

@ -27,7 +27,7 @@
namespace basctl
{
IMPL_LINK_TYPED( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void )
IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void )
{
(void)pTimer;
vcl::Window& rWindow = rParent.GetWindow();

8
basctl/source/dlged/managelang.cxx
View File

@ -144,7 +144,7 @@ void ManageLanguageDialog::ClearLanguageBox()
m_pLanguageLB->Clear();
}
IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void)
IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, Button*, void)
{
ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr );
if ( RET_OK == aDlg->Execute() )
@ -168,7 +168,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void)
}
}
IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void)
IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void)
{
ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelangdialog.ui");
if ( aQBox->Execute() == RET_OK )
@ -197,7 +197,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void)
}
}
IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void)
IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, Button*, void)
{
const sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos();
LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos ));
@ -214,7 +214,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void)
}
}
IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, SelectHdl, ListBox&, void)
IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, ListBox&, void)
{
const sal_Int32 nCount = m_pLanguageLB->GetEntryCount();
bool bEmpty = ( !nCount ||

2
basctl/source/inc/accessibledialogwindow.hxx
View File

@ -95,7 +95,7 @@ protected:
void UpdateChildren();
void SortChildren();
DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );

2
basctl/source/inc/baside3.hxx
View File

@ -73,7 +73,7 @@ protected:
virtual void Command( const CommandEvent& rCEvt ) override;
virtual void LoseFocus() override;
DECL_STATIC_LINK_TYPED( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void );
DECL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void );
virtual void DoInit() override;
virtual void DoScroll( ScrollBar* pCurScrollBar ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;

2
basctl/source/inc/basidesh.hxx
View File

@ -101,7 +101,7 @@ private:
void ImplStartListening( StarBASIC* pBasic );
DECL_LINK_TYPED( TabBarHdl, ::TabBar*, void );
DECL_LINK( TabBarHdl, ::TabBar*, void );
static unsigned nShellCount;

2
basctl/source/inc/bastypes.hxx
View File

@ -153,7 +153,7 @@ private:
VclPtr<ScrollBar> pShellHScrollBar;
VclPtr<ScrollBar> pShellVScrollBar;
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_LINK( ScrollHdl, ScrollBar*, void );
int nStatus;
ScriptDocument m_aDocument;

2
basctl/source/inc/dlged.hxx
View File

@ -102,7 +102,7 @@ public:
};
private:
DECL_LINK_TYPED(MarkTimeout, Idle *, void);
DECL_LINK(MarkTimeout, Idle *, void);
static void Print( Printer* pPrinter, const OUString& rTitle );

2
basctl/source/inc/dlgedfac.hxx
View File

@ -38,7 +38,7 @@ public:
DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel );
~DlgEdFactory();
DECL_LINK_TYPED( MakeObject, SdrObjCreatorParams, SdrObject* );
DECL_LINK( MakeObject, SdrObjCreatorParams, SdrObject* );
};
} // namespace basctl

2
basctl/source/inc/dlgedfunc.hxx
View File

@ -35,7 +35,7 @@ protected:
DlgEditor& rParent;
Timer aScrollTimer;
DECL_LINK_TYPED( ScrollTimeout, Timer *, void );
DECL_LINK( ScrollTimeout, Timer *, void );
void ForceScroll( const Point& rPos );
public:

2
basctl/source/inc/layout.hxx
View File

@ -121,7 +121,7 @@ private:
Point MakePoint (long, long) const;
Size MakeSize (long, long) const;
static bool IsDocking (DockingWindow const&);
DECL_LINK_TYPED(SplitHdl, Splitter*, void);
DECL_LINK(SplitHdl, Splitter*, void);
void CheckMarginsFor (Splitter*);
void InitSplitter (Splitter&);
} aLeftSide, aBottomSide;

8
basctl/source/inc/managelang.hxx
View File

@ -63,10 +63,10 @@ private:
void FillLanguageBox();
void ClearLanguageBox();
DECL_LINK_TYPED(AddHdl, Button*, void);
DECL_LINK_TYPED(DeleteHdl, Button*, void);
DECL_LINK_TYPED(MakeDefHdl, Button*, void);
DECL_LINK_TYPED(SelectHdl, ListBox&, void);
DECL_LINK(AddHdl, Button*, void);
DECL_LINK(DeleteHdl, Button*, void);
DECL_LINK(MakeDefHdl, Button*, void);
DECL_LINK(SelectHdl, ListBox&, void);
public:
ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr<LocalizationMgr> const & _pLMgr );

2
basic/qa/cppunit/basictest.cxx
View File

@ -112,7 +112,7 @@ bool MacroSnippet::Compile()
bool MacroSnippet::HasError() { return mbError; }
IMPL_LINK_TYPED( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
{
fprintf(stderr,"(%d:%d)\n",
StarBASIC::GetLine(), StarBASIC::GetCol1());

2
basic/qa/cppunit/basictest.hxx
View File

@ -43,7 +43,7 @@ public:
bool Compile();
DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
DECL_LINK( BasicErrorHdl, StarBASIC *, bool );
bool HasError();
};

8
basic/source/classes/sbxmod.cxx
View File

@ -456,10 +456,10 @@ public:
uno::Reference< frame::XDesktop2 > xDeskTop = frame::Desktop::create( comphelper::getProcessComponentContext() );
xDeskTop->terminate();
}
DECL_STATIC_LINK_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void );
DECL_STATIC_LINK( AsyncQuitHandler, OnAsyncQuit, void*, void );
};
IMPL_STATIC_LINK_NOARG_TYPED( AsyncQuitHandler, OnAsyncQuit, void*, void )
IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit, void*, void )
{
QuitApplication();
}
@ -1732,11 +1732,11 @@ public:
// restore error handler
StarBASIC::SetGlobalErrorHdl(mErrHandler);
}
DECL_LINK_TYPED( BasicErrorHdl, StarBASIC *, bool );
DECL_LINK( BasicErrorHdl, StarBASIC *, bool );
bool HasError() { return mbError; }
};
IMPL_LINK_TYPED( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
IMPL_LINK( ErrorHdlResetter, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
{
mbError = true;
return false;

2
basic/source/runtime/ddectrl.cxx
View File

@ -67,7 +67,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
return nDdeErrMap[ 2 * (nErr - DDE_FIRSTERR) + 1 ];
}
IMPL_LINK_TYPED( SbiDdeControl, Data, const DdeData*, pData, void )
IMPL_LINK( SbiDdeControl, Data, const DdeData*, pData, void )
{
aData = OUString::createFromAscii( static_cast<const char*>(static_cast<const void*>(*pData)) );
}

2
basic/source/runtime/ddectrl.hxx
View File

@ -29,7 +29,7 @@ class DdeData;
class SbiDdeControl
{
private:
DECL_LINK_TYPED( Data, const DdeData*, void );
DECL_LINK( Data, const DdeData*, void );
static SbError GetLastErr( DdeConnection* );
size_t GetFreeChannel();
std::vector<DdeConnection*> aConvList;

8
basic/source/runtime/inputbox.cxx
View File

@ -40,8 +40,8 @@ class SvRTLInputBox : public ModalDialog
void InitButtons( const Size& rDlgSize );
void PositionEdit( const Size& rDlgSize );
void PositionPrompt( const OUString& rPrompt, const Size& rDlgSize );
DECL_LINK_TYPED( OkHdl, Button *, void );
DECL_LINK_TYPED( CancelHdl, Button *, void );
DECL_LINK( OkHdl, Button *, void );
DECL_LINK( CancelHdl, Button *, void );
public:
SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle,
@ -129,13 +129,13 @@ void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize)
}
IMPL_LINK_NOARG_TYPED( SvRTLInputBox, OkHdl, Button *, void )
IMPL_LINK_NOARG( SvRTLInputBox, OkHdl, Button *, void )
{
aText = aEdit->GetText();
EndDialog( 1 );
}
IMPL_LINK_NOARG_TYPED( SvRTLInputBox, CancelHdl, Button *, void )
IMPL_LINK_NOARG( SvRTLInputBox, CancelHdl, Button *, void )
{
aText.clear();
EndDialog();

8
basic/source/runtime/iosys.cxx
View File

@ -66,8 +66,8 @@ class SbiInputDialog : public ModalDialog {
VclPtr<OKButton> aOk;
VclPtr<CancelButton> aCancel;
OUString aText;
DECL_LINK_TYPED( Ok, Button *, void );
DECL_LINK_TYPED( Cancel, Button *, void );
DECL_LINK( Ok, Button *, void );
DECL_LINK( Cancel, Button *, void );
public:
SbiInputDialog( vcl::Window*, const OUString& );
virtual ~SbiInputDialog() override { disposeOnce(); }
@ -111,13 +111,13 @@ void SbiInputDialog::dispose()
ModalDialog::dispose();
}
IMPL_LINK_NOARG_TYPED( SbiInputDialog, Ok, Button *, void )
IMPL_LINK_NOARG( SbiInputDialog, Ok, Button *, void )
{
aText = aInput->GetText();
EndDialog( 1 );
}
IMPL_LINK_NOARG_TYPED( SbiInputDialog, Cancel, Button *, void )
IMPL_LINK_NOARG( SbiInputDialog, Cancel, Button *, void )
{
EndDialog();
}

2
chart2/inc/ChartView.hxx
View File

@ -229,7 +229,7 @@ private: //methods
css::awt::Rectangle impl_createDiagramAndContent( const CreateShapeParam2D& rParam, const css::awt::Size& rPageSize );
DECL_LINK_TYPED( UpdateTimeBased, Timer*, void );
DECL_LINK( UpdateTimeBased, Timer*, void );
private: //member
::osl::Mutex m_aMutex;

2
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
View File

@ -1205,7 +1205,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref
}
}
IMPL_LINK_NOARG_TYPED(CombiColumnLineChartDialogController, ChangeLineCountHdl, Edit&, void)
IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl, Edit&, void)
{
if( m_pChangeListener )
m_pChangeListener->stateChanged(this);

2
chart2/source/controller/dialogs/ChartTypeDialogController.hxx
View File

@ -280,7 +280,7 @@ public:
virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override;
private:
DECL_LINK_TYPED( ChangeLineCountHdl, Edit&, void );
DECL_LINK( ChangeLineCountHdl, Edit&, void );
private:
VclPtr<FixedText> m_pFT_NumberOfLines;

12
chart2/source/controller/dialogs/DataBrowser.cxx
View File

@ -181,8 +181,8 @@ private:
Link<SeriesHeaderEdit*,void> m_aChangeLink;
void notifyChanges();
DECL_LINK_TYPED( SeriesNameChanged, Edit&, void );
DECL_LINK_TYPED( SeriesNameEdited, Edit&, void );
DECL_LINK( SeriesNameChanged, Edit&, void );
DECL_LINK( SeriesNameEdited, Edit&, void );
static Image GetChartTypeImage(
const Reference< chart2::XChartType > & xChartType,
@ -321,12 +321,12 @@ void SeriesHeader::SetEditChangedHdl( const Link<SeriesHeaderEdit*,void> & rLink
m_aChangeLink = rLink;
}
IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameChanged, Edit&, void)
IMPL_LINK_NOARG(SeriesHeader, SeriesNameChanged, Edit&, void)
{
notifyChanges();
}
IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameEdited, Edit&, void)
IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited, Edit&, void)
{
m_bSeriesNameChangePending = true;
}
@ -1285,7 +1285,7 @@ void DataBrowser::ImplAdjustHeaderControls()
}
}
IMPL_LINK_TYPED( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void )
IMPL_LINK( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void )
{
impl::SeriesHeaderEdit* pEdit = static_cast<impl::SeriesHeaderEdit*>(&rControl);
pEdit->SetShowWarningBox( !m_bDataValid );
@ -1300,7 +1300,7 @@ IMPL_LINK_TYPED( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void )
}
}
IMPL_LINK_TYPED( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, void )
IMPL_LINK( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, void )
{
if( pEdit )
{

4
chart2/source/controller/dialogs/DataBrowser.hxx
View File

@ -175,8 +175,8 @@ private:
OUString GetColString( sal_Int32 nColumnId ) const;
static OUString GetRowString( sal_Int32 nRow );
DECL_LINK_TYPED( SeriesHeaderGotFocus, Control&, void );
DECL_LINK_TYPED( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void );
DECL_LINK( SeriesHeaderGotFocus, Control&, void );
DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void );
DataBrowser( const DataBrowser & ) = delete;
};

2
chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
View File

@ -45,7 +45,7 @@ void TimerTriggeredControllerLock::startTimer()
m_apControllerLockGuard.reset( new ControllerLockGuardUNO(m_xModel) );
m_aTimer.Start();
}
IMPL_LINK_NOARG_TYPED(TimerTriggeredControllerLock, TimerTimeout, Timer *, void)
IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout, Timer *, void)
{
m_apControllerLockGuard.reset();
}

2
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
View File

@ -208,7 +208,7 @@ void CreationWizardUnoDlg::createDialogOnDemand()
}
}
}
IMPL_LINK_TYPED( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void )
IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void )
{
if(rEvent.GetId() == VCLEVENT_OBJECT_DYING)
m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog

6
chart2/source/controller/dialogs/dlg_DataEditor.cxx
View File

@ -111,7 +111,7 @@ void DataEditor::dispose()
}
// react on click (or keypress) on toolbar icon
IMPL_LINK_NOARG_TYPED(DataEditor, ToolboxHdl, ToolBox *, void)
IMPL_LINK_NOARG(DataEditor, ToolboxHdl, ToolBox *, void)
{
sal_uInt16 nId = m_pTbxData->GetCurItemId();
@ -132,7 +132,7 @@ IMPL_LINK_NOARG_TYPED(DataEditor, ToolboxHdl, ToolBox *, void)
}
// refresh toolbar icons according to currently selected cell in browse box
IMPL_LINK_NOARG_TYPED(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void)
IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void)
{
if( m_bReadOnly )
return;
@ -167,7 +167,7 @@ void DataEditor::SetReadOnly( bool bReadOnly )
m_xBrwData->SetReadOnly( m_bReadOnly );
}
IMPL_LINK_NOARG_TYPED(DataEditor, MiscHdl, LinkParamNone*, void)
IMPL_LINK_NOARG(DataEditor, MiscHdl, LinkParamNone*, void)
{
SvtMiscOptions aMiscOptions;
sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() );

2
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
View File

@ -639,7 +639,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
}
}
IMPL_LINK_TYPED(SchAttribTabDlg, OKPressed, Button*, pButton, void)
IMPL_LINK(SchAttribTabDlg, OKPressed, Button*, pButton, void)
{
m_bOKPressed = true;
m_aOriginalOKClickHdl.Call( pButton );

4
chart2/source/controller/dialogs/res_DataLabel.cxx
View File

@ -182,7 +182,7 @@ void DataLabelResources::SetNumberFormatter( SvNumberFormatter* pFormatter )
m_pNumberFormatter = pFormatter;
}
IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void )
IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void )
{
if( !m_pPool || !m_pNumberFormatter )
{
@ -230,7 +230,7 @@ IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, v
}
}
IMPL_LINK_TYPED( DataLabelResources, CheckHdl, Button*, pBox, void )
IMPL_LINK( DataLabelResources, CheckHdl, Button*, pBox, void )
{
if( pBox )
static_cast<CheckBox*>(pBox)->EnableTriState( false );

4
chart2/source/controller/dialogs/res_DataLabel.hxx
View File

@ -83,8 +83,8 @@ private:
VclPtr<vcl::Window> m_pWindow;
SfxItemPool* m_pPool;
DECL_LINK_TYPED(NumberFormatDialogHdl, Button *, void );
DECL_LINK_TYPED(CheckHdl, Button*, void );
DECL_LINK(NumberFormatDialogHdl, Button *, void );
DECL_LINK(CheckHdl, Button*, void );
void EnableControls();
};

14
chart2/source/controller/dialogs/res_ErrorBar.cxx
View File

@ -340,12 +340,12 @@ void ErrorBarResources::UpdateControlStates()
}
}
IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen2, ListBox&, void )
IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2, ListBox&, void )
{
CategoryChosen(nullptr);
}
IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void )
IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, Button*, void )
{
m_bErrorKindUnique = true;
SvxChartKindError eOldError = m_eErrorKind;
@ -403,13 +403,13 @@ IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void )
UpdateControlStates();
}
IMPL_LINK_NOARG_TYPED(ErrorBarResources, SynchronizePosAndNeg, CheckBox&, void)
IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg, CheckBox&, void)
{
UpdateControlStates();
PosValueChanged( *m_pMfPositive );
}
IMPL_LINK_NOARG_TYPED(ErrorBarResources, PosValueChanged, Edit&, void)
IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged, Edit&, void)
{
if( m_pCbSyncPosNeg->IsChecked())
{
@ -423,7 +423,7 @@ IMPL_LINK_NOARG_TYPED(ErrorBarResources, PosValueChanged, Edit&, void)
}
}
IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void)
IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, Button*, void)
{
m_bIndicatorUnique = true;
if( m_pRbBoth->IsChecked())
@ -438,7 +438,7 @@ IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void)
UpdateControlStates();
}
IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void )
IMPL_LINK( ErrorBarResources, ChooseRange, Button*, pButton, void )
{
OSL_ASSERT( m_apRangeSelectionHelper.get());
if( ! m_apRangeSelectionHelper.get())
@ -470,7 +470,7 @@ IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void )
m_pCurrentRangeChoosingField = nullptr;
}
IMPL_LINK_TYPED( ErrorBarResources, RangeChanged, Edit&, rEdit, void )
IMPL_LINK( ErrorBarResources, RangeChanged, Edit&, rEdit, void )
{
if( &rEdit == m_pEdRangePositive )
{

4
chart2/source/controller/dialogs/res_LegendPosition.cxx
View File

@ -165,7 +165,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
}
}
IMPL_LINK_NOARG_TYPED(LegendPositionResources, PositionEnableHdl, CheckBox&, void)
IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, CheckBox&, void)
{
bool bEnable = m_pCbxShow == nullptr || m_pCbxShow->IsChecked();
@ -225,7 +225,7 @@ void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const
rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, m_pCbxShow == nullptr || m_pCbxShow->IsChecked()) );
}
IMPL_LINK_TYPED( LegendPositionResources, PositionChangeHdl, RadioButton&, rRadio, void )
IMPL_LINK( LegendPositionResources, PositionChangeHdl, RadioButton&, rRadio, void )
{
//for each radio click there are coming two change events
//first uncheck of previous button -> ignore that call

6
chart2/source/controller/dialogs/res_Trendline.cxx
View File

@ -93,7 +93,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet&
TrendlineResources::~TrendlineResources()
{}
IMPL_LINK_TYPED( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void )
IMPL_LINK( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void )
{
if( pRadioButton == m_pRB_Linear )
m_eTrendLineType = SvxChartRegress::Linear;
@ -348,7 +348,7 @@ void TrendlineResources::UpdateControlStates()
m_pEE_YName->Enable( !bMovingAverage && m_pCB_ShowEquation->IsChecked() );
}
IMPL_LINK_TYPED( TrendlineResources, ChangeValue, Edit&, rNumericField, void)
IMPL_LINK( TrendlineResources, ChangeValue, Edit&, rNumericField, void)
{
if( &rNumericField == m_pNF_Degree )
{
@ -388,7 +388,7 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
UpdateControlStates();
}
IMPL_LINK_TYPED( TrendlineResources, ShowEquation, CheckBox&, rCheckBox, void)
IMPL_LINK( TrendlineResources, ShowEquation, CheckBox&, rCheckBox, void)
{
if( &rCheckBox == m_pCB_ShowEquation )
{

6
chart2/source/controller/dialogs/res_Trendline.hxx
View File

@ -80,9 +80,9 @@ private:
sal_Int32 m_nNbPoints;
void UpdateControlStates();
DECL_LINK_TYPED( SelectTrendLine, Button*, void );
DECL_LINK_TYPED( ChangeValue, Edit&, void);
DECL_LINK_TYPED( ShowEquation, CheckBox&, void);
DECL_LINK( SelectTrendLine, Button*, void );
DECL_LINK( ChangeValue, Edit&, void);
DECL_LINK( ShowEquation, CheckBox&, void);
};
} // namespace chart

6
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
View File

@ -291,7 +291,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme()
}
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void)
IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void)
{
if( !m_bUpdateOtherControls )
return;
@ -316,7 +316,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&,
initControlsFromModel();
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void)
IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void)
{
if( !m_bUpdateOtherControls )
return;
@ -325,7 +325,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&,
applyShadeModeToModel();
updateScheme();
}
IMPL_LINK_TYPED( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, CheckBox&, rCheckBox, void )
IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, CheckBox&, rCheckBox, void )
{
if( !m_bUpdateOtherControls )
return;

6
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
View File

@ -44,9 +44,9 @@ public:
virtual void ActivatePage() override;
private:
DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void );
DECL_LINK_TYPED( SelectShading, CheckBox&, void );
DECL_LINK_TYPED( SelectRoundedEdgeOrObjectLines, CheckBox&, void );
DECL_LINK( SelectSchemeHdl, ListBox&, void );
DECL_LINK( SelectShading, CheckBox&, void );
DECL_LINK( SelectRoundedEdgeOrObjectLines, CheckBox&, void );
void initControlsFromModel();
void applyShadeModeToModel();

12
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
View File

@ -195,7 +195,7 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel()
m_bAngleChangePending = false;
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void)
IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void)
{
m_nXRotation = m_pMFXRotation->GetValue();
m_nYRotation = m_pMFYRotation->GetValue();
@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void)
m_bAngleChangePending = true;
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleChanged, Edit&, void)
IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleChanged, Edit&, void)
{
applyAnglesToModel();
}
@ -229,23 +229,23 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
m_bPerspectiveChangePending = false;
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveEdited, Edit&, void)
IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveEdited, Edit&, void)
{
m_bPerspectiveChangePending = true;
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Edit&, void)
IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Edit&, void)
{
applyPerspectiveToModel();
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, CheckBox&, void)
IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, CheckBox&, void)
{
m_pMFPerspective->Enable( m_pCbxPerspective->IsChecked() );
applyPerspectiveToModel();
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, CheckBox&, void)
IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, CheckBox&, void)
{
ControllerLockHelperGuard aGuard( m_rControllerLockHelper );

12
chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
View File

@ -45,16 +45,16 @@ public:
void commitPendingChanges();
// is called by timer to apply changes to model
DECL_LINK_TYPED( AngleChanged, Edit&, void );
DECL_LINK( AngleChanged, Edit&, void );
// is called immediately when a field changes
DECL_LINK_TYPED( AngleEdited, Edit&, void );
DECL_LINK( AngleEdited, Edit&, void );
// is called by timer to apply changes to model
DECL_LINK_TYPED( PerspectiveChanged, Edit&, void );
DECL_LINK( PerspectiveChanged, Edit&, void );
// is called immediately when a field changes
DECL_LINK_TYPED( PerspectiveEdited, Edit&, void );
DECL_LINK_TYPED( PerspectiveToggled, CheckBox&, void );
DECL_LINK_TYPED( RightAngledAxesToggled, CheckBox&, void );
DECL_LINK( PerspectiveEdited, Edit&, void );
DECL_LINK( PerspectiveToggled, CheckBox&, void );
DECL_LINK( RightAngledAxesToggled, CheckBox&, void );
private:
void applyAnglesToModel();

12
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
View File

@ -308,7 +308,7 @@ void ThreeD_SceneIllumination_TabPage::dispose()
TabPage::dispose();
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, void)
IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, void)
{
if( m_bInCommitToModel )//don't read own changes
return;
@ -342,7 +342,7 @@ void ThreeD_SceneIllumination_TabPage::applyLightSourcesToModel()
m_aTimerTriggeredControllerLock.startTimer();
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLightCtl3D*, void)
IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLightCtl3D*, void)
{
m_aTimerTriggeredControllerLock.startTimer();
@ -392,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLig
applyLightSourcesToModel();
}
IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLightCtl3D*, void)
IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLightCtl3D*, void)
{
sal_uInt32 nLightNumber = m_pCtl_Preview->GetSvx3DLightControl().GetSelectedLight();
if(nLightNumber<8)
@ -405,7 +405,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLig
}
}
IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void )
IMPL_LINK( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void )
{
bool bIsAmbientLight = (pButton==m_pBtn_AmbientLight_Color);
ColorLB* pListBox = ( bIsAmbientLight ? m_pLB_AmbientLight : m_pLB_LightSource);
@ -441,7 +441,7 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pBut
}
}
IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void )
IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void )
{
ColorLB* pListBox = static_cast<ColorLB*>(&rBox);
if(pListBox==m_pLB_AmbientLight)
@ -471,7 +471,7 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBo
this->updatePreview();
}
IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void )
IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void )
{
LightButton* pButton = static_cast<LightButton*>(pBtn);
if( !pButton )

12
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
View File

@ -58,16 +58,16 @@ public:
virtual void dispose() override;
private:
DECL_LINK_TYPED( ClickLightSourceButtonHdl, Button*, void );
DECL_LINK_TYPED( SelectColorHdl, ListBox&, void );
DECL_LINK_TYPED( ColorDialogHdl, Button*, void );
DECL_LINK_TYPED( PreviewChangeHdl, SvxLightCtl3D*, void );
DECL_LINK_TYPED( PreviewSelectHdl, SvxLightCtl3D*, void );
DECL_LINK( ClickLightSourceButtonHdl, Button*, void );
DECL_LINK( SelectColorHdl, ListBox&, void );
DECL_LINK( ColorDialogHdl, Button*, void );
DECL_LINK( PreviewChangeHdl, SvxLightCtl3D*, void );
DECL_LINK( PreviewSelectHdl, SvxLightCtl3D*, void );
void updatePreview();
private:
DECL_LINK_TYPED(fillControlsFromModel, void *, void);
DECL_LINK(fillControlsFromModel, void *, void);
void applyLightSourceToModel( sal_uInt32 nLightNumber );
void applyLightSourcesToModel();

2
chart2/source/controller/dialogs/tp_AxisLabel.cxx
View File

@ -298,7 +298,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
// event handling routines
IMPL_LINK_NOARG_TYPED(SchAxisLabelTabPage, ToggleShowLabel, Button*, void)
IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel, Button*, void)
{
bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE );

2
chart2/source/controller/dialogs/tp_AxisLabel.hxx
View File

@ -65,7 +65,7 @@ private:
bool m_bHasInitialStacking; /// false = checkbox in tristate
bool m_bComplexCategories;
DECL_LINK_TYPED ( ToggleShowLabel, Button*, void );
DECL_LINK ( ToggleShowLabel, Button*, void );
public:
SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );

4
chart2/source/controller/dialogs/tp_AxisPositions.cxx
View File

@ -313,7 +313,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning
m_bSupportAxisPositioning = bSupportAxisPositioning;
}
IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
{
sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
m_pED_CrossesAt->Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis );
@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void)
PlaceLabelsSelectHdl( *m_pLB_PlaceLabels );
}
IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void)
IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void)
{
sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();

4
chart2/source/controller/dialogs/tp_AxisPositions.hxx
View File

@ -50,8 +50,8 @@ public:
void SupportAxisPositioning( bool bSupportAxisPositioning );
private: //methods:
DECL_LINK_TYPED( CrossesAtSelectHdl, ListBox&, void );
DECL_LINK_TYPED( PlaceLabelsSelectHdl, ListBox&, void );
DECL_LINK( CrossesAtSelectHdl, ListBox&, void );
DECL_LINK( PlaceLabelsSelectHdl, ListBox&, void );
private: //member:
VclPtr<VclFrame> m_pFL_AxisLine;

48
chart2/source/controller/dialogs/tp_ChartType.cxx
View File

@ -55,8 +55,8 @@ public:
void fillParameter( ChartTypeParameter& rParameter );
private:
DECL_LINK_TYPED( Dim3DLookCheckHdl, CheckBox&, void );
DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void );
DECL_LINK( Dim3DLookCheckHdl, CheckBox&, void );
DECL_LINK( SelectSchemeHdl, ListBox&, void );
private:
VclPtr<CheckBox> m_pCB_3DLook;
@ -104,13 +104,13 @@ void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter )
rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown;
}
IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void)
IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void)
{
if(m_pChangeListener)
m_pChangeListener->stateChanged(this);
}
IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void)
IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void)
{
if(m_pChangeListener)
m_pChangeListener->stateChanged(this);
@ -127,7 +127,7 @@ public:
void fillParameter( ChartTypeParameter& rParameter );
private:
DECL_LINK_TYPED( SortByXValuesCheckHdl, CheckBox&, void );
DECL_LINK( SortByXValuesCheckHdl, CheckBox&, void );
private:
VclPtr<CheckBox> m_pCB_XValueSorting;
@ -155,7 +155,7 @@ void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter )
rParameter.bSortByXValues = m_pCB_XValueSorting->IsChecked();
}
IMPL_LINK_NOARG_TYPED(SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox&, void)
IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox&, void)
{
if(m_pChangeListener)
m_pChangeListener->stateChanged(this);
@ -172,8 +172,8 @@ public:
void fillParameter( ChartTypeParameter& rParameter );
private:
DECL_LINK_TYPED( StackingChangeHdl, RadioButton&, void );
DECL_LINK_TYPED( StackingEnableHdl, CheckBox&, void );
DECL_LINK( StackingChangeHdl, RadioButton&, void );
DECL_LINK( StackingEnableHdl, CheckBox&, void );
private:
VclPtr<CheckBox> m_pCB_Stacked;
@ -250,7 +250,7 @@ void StackingResourceGroup::fillParameter( ChartTypeParameter& rParameter )
else if(m_pRB_Stack_Z->IsChecked())
rParameter.eStackMode = GlobalStackMode_STACK_Z;
}
IMPL_LINK_TYPED( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, void )
IMPL_LINK( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, void )
{
//for each radio click there are coming two change events
//first uncheck of previous button -> ignore that call
@ -258,7 +258,7 @@ IMPL_LINK_TYPED( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio,
if( m_pChangeListener && rRadio.IsChecked() )
m_pChangeListener->stateChanged(this);
}
IMPL_LINK_NOARG_TYPED(StackingResourceGroup, StackingEnableHdl, CheckBox&, void)
IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, CheckBox&, void)
{
if( m_pChangeListener )
m_pChangeListener->stateChanged(this);
@ -274,7 +274,7 @@ public:
void fillParameter( ChartTypeParameter& rParam );
private:
DECL_LINK_TYPED( SettingChangedHdl, CheckBox&, void );
DECL_LINK( SettingChangedHdl, CheckBox&, void );
private:
VclPtr<CheckBox> m_pCB_RoundedEdge;
};
@ -300,7 +300,7 @@ void GL3DResourceGroup::fillParameter( ChartTypeParameter& rParam )
rParam.mbRoundedEdge = m_pCB_RoundedEdge->IsChecked();
}
IMPL_LINK_NOARG_TYPED( GL3DResourceGroup, SettingChangedHdl, CheckBox&, void )
IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl, CheckBox&, void )
{
if (m_pChangeListener)
m_pChangeListener->stateChanged(this);
@ -319,7 +319,7 @@ public:
virtual void StateChanged( StateChangedType nType ) override;
private:
DECL_LINK_TYPED( SplineTypeListBoxHdl, ListBox&, void );
DECL_LINK( SplineTypeListBoxHdl, ListBox&, void );
private:
VclPtr<ListBox> m_pLB_Spline_Type;
@ -392,7 +392,7 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool
rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue());
rParameter.nSplineOrder = static_cast< sal_Int32 >( m_pMF_SplineOrder->GetValue());
}
IMPL_LINK_NOARG_TYPED(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void)
IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void)
{
m_pFT_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos());
m_pMF_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos());
@ -491,9 +491,9 @@ public:
void fillParameter( ChartTypeParameter& rParameter );
private:
DECL_LINK_TYPED( LineTypeChangeHdl, ListBox&, void );
DECL_LINK_TYPED( SplineDetailsDialogHdl, Button*, void );
DECL_LINK_TYPED( SteppedDetailsDialogHdl, Button*, void );
DECL_LINK( LineTypeChangeHdl, ListBox&, void );
DECL_LINK( SplineDetailsDialogHdl, Button*, void );
DECL_LINK( SteppedDetailsDialogHdl, Button*, void );
SplinePropertiesDialog& getSplinePropertiesDialog();
SteppedPropertiesDialog& getSteppedPropertiesDialog();
@ -584,12 +584,12 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter )
break;
}
}
IMPL_LINK_NOARG_TYPED(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void)
IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void)
{
if( m_pChangeListener )
m_pChangeListener->stateChanged(this);
}
IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void)
IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void)
{
ChartTypeParameter aOldParameter;
@ -609,7 +609,7 @@ IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void
getSplinePropertiesDialog().fillControls( aOldParameter );
}
}
IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void)
IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void)
{
ChartTypeParameter aOldParameter;
@ -641,7 +641,7 @@ public:
void fillParameter( ChartTypeParameter& rParameter );
private:
DECL_LINK_TYPED( GeometryChangeHdl, ListBox&, void );
DECL_LINK( GeometryChangeHdl, ListBox&, void );
private:
BarGeometryResources m_aGeometryResources;
@ -673,7 +673,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter )
rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos();
}
IMPL_LINK_NOARG_TYPED(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void)
IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void)
{
if( m_pChangeListener )
m_pChangeListener->stateChanged(this);
@ -872,7 +872,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType()
pTypeController = m_aChartTypeDialogControllerList[nM];
return pTypeController;
}
IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void)
IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void)
{
if( m_pCurrentMainType )
{
@ -884,7 +884,7 @@ IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void)
}
}
IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void)
IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void)
{
selectMainType();
}

4
chart2/source/controller/dialogs/tp_ChartType.hxx
View File

@ -70,8 +70,8 @@ protected:
void commitToModel( const ChartTypeParameter& rParameter );
void selectMainType();
DECL_LINK_TYPED( SelectMainTypeHdl, ListBox&, void );
DECL_LINK_TYPED( SelectSubTypeHdl, ValueSet*, void );
DECL_LINK( SelectMainTypeHdl, ListBox&, void );
DECL_LINK( SelectSubTypeHdl, ValueSet*, void );
protected:
VclPtr<FixedText> m_pFT_ChooseType;

20
chart2/source/controller/dialogs/tp_DataSource.cxx
View File

@ -529,7 +529,7 @@ void DataSourceTabPage::updateControlState()
isValid();
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBox*, void)
IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBox*, void)
{
m_rDialogModel.startControllerLockTimer();
if( m_pLB_SERIES->FirstSelected())
@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBo
updateControlState();
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void)
IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void)
{
m_rDialogModel.startControllerLockTimer();
SvTreeListEntry * pEntry = m_pLB_ROLE->FirstSelected();
@ -564,7 +564,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*
}
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void)
IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void)
{
OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
m_pCurrentRangeChoosingField = m_pEDT_RANGE;
@ -605,7 +605,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, voi
m_pCurrentRangeChoosingField = nullptr;
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void)
IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void)
{
OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
m_pCurrentRangeChoosingField = m_pEDT_CATEGORIES;
@ -619,7 +619,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button
m_rDialogModel.getCategoriesRange(), aStr, *this );
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void)
IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@ -657,7 +657,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void)
SeriesSelectionChangedHdl( nullptr );
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void)
IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@ -699,7 +699,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void)
}
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void)
IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@ -714,7 +714,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void)
}
}
IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void)
IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl, Button*, void)
{
m_rDialogModel.startControllerLockTimer();
SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected());
@ -729,7 +729,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void)
}
}
IMPL_LINK_TYPED( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void )
IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void )
{
// note: isValid sets the color of the edit field
if( isRangeFieldContentValid( rEdit ))
@ -747,7 +747,7 @@ IMPL_LINK_TYPED( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void )
isValid();
}
IMPL_LINK_TYPED( DataSourceTabPage, RangeUpdateDataHdl, Edit&, rEdit, void )
IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit&, rEdit, void )
{
// note: isValid sets the color of the edit field
if( isRangeFieldContentValid( rEdit ))

20
chart2/source/controller/dialogs/tp_DataSource.hxx
View File

@ -73,16 +73,16 @@ protected:
virtual void initializePage() override;
DECL_LINK_TYPED( SeriesSelectionChangedHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( RoleSelectionChangedHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( MainRangeButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( CategoriesRangeButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( AddButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( RemoveButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( RangeModifiedHdl, Edit&, void );
DECL_LINK_TYPED( RangeUpdateDataHdl, Edit&, void );
DECL_LINK_TYPED( UpButtonClickedHdl, Button*, void );
DECL_LINK_TYPED( DownButtonClickedHdl, Button*, void );
DECL_LINK( SeriesSelectionChangedHdl, SvTreeListBox*, void );
DECL_LINK( RoleSelectionChangedHdl, SvTreeListBox*, void );
DECL_LINK( MainRangeButtonClickedHdl, Button*, void );
DECL_LINK( CategoriesRangeButtonClickedHdl, Button*, void );
DECL_LINK( AddButtonClickedHdl, Button*, void );
DECL_LINK( RemoveButtonClickedHdl, Button*, void );
DECL_LINK( RangeModifiedHdl, Edit&, void );
DECL_LINK( RangeUpdateDataHdl, Edit&, void );
DECL_LINK( UpButtonClickedHdl, Button*, void );
DECL_LINK( DownButtonClickedHdl, Button*, void );
// ____ RangeSelectionListenerParent ____
virtual void listeningFinished( const OUString & rNewRange ) override;

10
chart2/source/controller/dialogs/tp_RangeChooser.cxx
View File

@ -349,30 +349,30 @@ bool RangeChooserTabPage::isValid()
return bIsValid;
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlEditedHdl, Edit&, void)
IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, Edit&, void)
{
setDirty();
isValid();
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedRadioHdl, RadioButton&, void)
IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, RadioButton&, void)
{
ControlChangedHdl(*m_pED_Range);
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedCheckBoxHdl, CheckBox&, void)
IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, CheckBox&, void)
{
ControlChangedHdl(*m_pED_Range);
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedHdl, Edit&, void)
IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl, Edit&, void)
{
setDirty();
if( isValid())
changeDialogModelAccordingToControls();
}
IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ChooseRangeHdl, Button*, void)
IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl, Button*, void)
{
OUString aRange = m_pED_Range->GetText();
OUString aTitle = m_pFTTitle->GetText();

10
chart2/source/controller/dialogs/tp_RangeChooser.hxx
View File

@ -69,11 +69,11 @@ protected: //methods
bool isValid();
void setDirty();
DECL_LINK_TYPED( ChooseRangeHdl, Button*, void );
DECL_LINK_TYPED( ControlChangedHdl, Edit&, void );
DECL_LINK_TYPED( ControlChangedCheckBoxHdl, CheckBox&, void );
DECL_LINK_TYPED( ControlChangedRadioHdl, RadioButton&, void );
DECL_LINK_TYPED( ControlEditedHdl, Edit&, void );
DECL_LINK( ChooseRangeHdl, Button*, void );
DECL_LINK( ControlChangedHdl, Edit&, void );
DECL_LINK( ControlChangedCheckBoxHdl, CheckBox&, void );
DECL_LINK( ControlChangedRadioHdl, RadioButton&, void );
DECL_LINK( ControlEditedHdl, Edit&, void );
protected: //member

6
chart2/source/controller/dialogs/tp_Scale.cxx
View File

@ -157,7 +157,7 @@ void ScaleTabPage::dispose()
SfxTabPage::dispose();
}
IMPL_STATIC_LINK_TYPED(
IMPL_STATIC_LINK(
ScaleTabPage, FmtFieldModifiedHdl, Edit&, rEdit, void )
{
FormattedField& rFmtField = static_cast<FormattedField&>(rEdit);
@ -217,7 +217,7 @@ void ScaleTabPage::EnableControls()
EnableValueHdl(m_pCbx_AutoTimeResolution);
}
IMPL_LINK_TYPED( ScaleTabPage, EnableValueHdl, Button *, pButton, void )
IMPL_LINK( ScaleTabPage, EnableValueHdl, Button *, pButton, void )
{
CheckBox * pCbx = static_cast<CheckBox*>(pButton);
bool bEnable = pCbx && !pCbx->IsChecked() && pCbx->IsEnabled();
@ -257,7 +257,7 @@ enum AxisTypeListBoxEntry
TYPE_DATE=2
};
IMPL_LINK_NOARG_TYPED(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
{
const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos();
if( nPos==TYPE_DATE )

6
chart2/source/controller/dialogs/tp_Scale.hxx
View File

@ -99,9 +99,9 @@ private:
void EnableControls();
DECL_LINK_TYPED( SelectAxisTypeHdl, ListBox&, void );
DECL_LINK_TYPED( EnableValueHdl, Button*, void );
DECL_STATIC_LINK_TYPED( ScaleTabPage, FmtFieldModifiedHdl, Edit&, void);
DECL_LINK( SelectAxisTypeHdl, ListBox&, void );
DECL_LINK( EnableValueHdl, Button*, void );
DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, Edit&, void);
/** shows a warning window due to an invalid input.

2
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
View File

@ -87,7 +87,7 @@ void SchOptionTabPage::dispose()
SfxTabPage::dispose();
}
IMPL_LINK_NOARG_TYPED(SchOptionTabPage, EnableHdl, Button*, void)
IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, Button*, void)
{
if( m_nAllSeriesAxisIndex == 0 )
m_pCBAxisSideBySide->Enable( m_pRbtAxis2->IsChecked());

2
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
View File

@ -62,7 +62,7 @@ private: //member
VclPtr<CheckBox> m_pCBIncludeHiddenCells;
DECL_LINK_TYPED(EnableHdl, Button*, void );
DECL_LINK(EnableHdl, Button*, void );
sal_Int32 m_nAllSeriesAxisIndex;

6
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
View File

@ -146,15 +146,15 @@ void TitlesAndObjectsTabPage::commitToModel()
}
IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, CheckBox&, void)
IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, CheckBox&, void)
{
ChangeHdl(nullptr);
}
IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeEditHdl, Edit&, void)
IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeEditHdl, Edit&, void)
{
ChangeHdl(nullptr);
}
IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeHdl, LinkParamNone*, void)
IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeHdl, LinkParamNone*, void)
{
if( m_bCommitToModel )
commitToModel();

6
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
View File

@ -51,9 +51,9 @@ public:
protected:
void commitToModel();
DECL_LINK_TYPED( ChangeHdl, LinkParamNone*, void );
DECL_LINK_TYPED( ChangeEditHdl, Edit&, void );
DECL_LINK_TYPED( ChangeCheckBoxHdl, CheckBox&, void );
DECL_LINK( ChangeHdl, LinkParamNone*, void );
DECL_LINK( ChangeEditHdl, Edit&, void );
DECL_LINK( ChangeCheckBoxHdl, CheckBox&, void );
protected:
std::unique_ptr< TitleResources > m_xTitleResources;

4
chart2/source/controller/inc/ChartController.hxx
View File

@ -376,7 +376,7 @@ public:
ViewElementListProvider getViewElementListProvider();
DrawModelWrapper* GetDrawModelWrapper();
DECL_LINK_TYPED( NotifyUndoActionHdl, SdrUndoAction*, void );
DECL_LINK( NotifyUndoActionHdl, SdrUndoAction*, void );
css::uno::Reference<css::uno::XInterface> const & getChartView();
@ -552,7 +552,7 @@ private:
void impl_ShapeControllerDispatch( const css::util::URL& rURL,
const css::uno::Sequence< css::beans::PropertyValue >& rArgs );
DECL_LINK_TYPED( DoubleClickWaitingHdl, Timer*, void );
DECL_LINK( DoubleClickWaitingHdl, Timer*, void );
void execute_DoubleClick( const Point* pMousePixel );
void startDoubleClickWaiting();
void stopDoubleClickWaiting();

2
chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
View File

@ -41,7 +41,7 @@ private:
std::unique_ptr< ControllerLockGuardUNO > m_apControllerLockGuard;
AutoTimer m_aTimer;
DECL_LINK_TYPED( TimerTimeout, Timer*, void );
DECL_LINK( TimerTimeout, Timer*, void );
};
} //namespace chart

2
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
View File

@ -95,7 +95,7 @@ public:
virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
DECL_LINK_TYPED( DialogEventHdl, VclWindowEvent&, void );
DECL_LINK( DialogEventHdl, VclWindowEvent&, void );
protected:
// ____ OComponentHelper ____

6
chart2/source/controller/inc/dlg_DataEditor.hxx
View File

@ -70,11 +70,11 @@ private:
m_xContext;
/// handles actions of the toolbox
DECL_LINK_TYPED( ToolboxHdl, ToolBox*, void );
DECL_LINK( ToolboxHdl, ToolBox*, void );
/// is called, if the cursor of the table has moved
DECL_LINK_TYPED( BrowserCursorMovedHdl, DataBrowser*, void);
DECL_LINK( BrowserCursorMovedHdl, DataBrowser*, void);
/// this is called if MiscOptions change, esp. High-Contrast mode
DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void );
DECL_LINK( MiscHdl, LinkParamNone*, void );
void UpdateData();
/// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox

Some files were not shown because too many files have changed in this diff Show More