[Libreoffice-commits] core.git: 6 commits - dbaccess/source extensions/source sc/source sd/source
Noel Grandin
noel at peralex.com
Mon Oct 19 00:06:43 PDT 2015
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 32 ------
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 8 -
extensions/source/propctrlr/commoncontrol.cxx | 3
extensions/source/propctrlr/commoncontrol.hxx | 3
extensions/source/propctrlr/formlinkdialog.cxx | 9 -
extensions/source/propctrlr/formlinkdialog.hxx | 2
extensions/source/propctrlr/standardcontrol.hxx | 6 -
extensions/source/propctrlr/usercontrol.cxx | 2
sc/source/ui/condformat/condformatdlg.cxx | 11 +-
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/inc/condformatdlg.hxx | 2
sc/source/ui/inc/condformatdlgentry.hxx | 2
sc/source/ui/inc/funcpage.hxx | 94 -------------------
sd/source/ui/animations/CustomAnimationDialog.cxx | 105 ++++++++++------------
sd/source/ui/animations/CustomAnimationDialog.hxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 3
sd/source/ui/animations/CustomAnimationPane.hxx | 6 -
17 files changed, 76 insertions(+), 216 deletions(-)
New commits:
commit 6aa90a44f23cc469c796d5fe79b1f9841ff5e847
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 16 15:14:13 2015 +0200
remove dead Link<> code
Change-Id: I01891cd34535ea08a07c3bb47976f6c9a70c3656
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index eb17f6c..689a47d 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -94,17 +94,6 @@ namespace dbaui
m_pTextSeparator->InsertEntry( m_aTextSeparatorList.getToken( i, '\t' ) );
m_pTextSeparator->InsertEntry(m_aTextNone);
- // set the modify handlers
- m_pFieldSeparator->SetUpdateDataHdl(LINK(this, OTextConnectionHelper, OnControlEditModified));
- m_pFieldSeparator->SetSelectHdl(LINK(this, OTextConnectionHelper, ComboBoxSelectHdl));
- m_pTextSeparator->SetUpdateDataHdl(LINK(this, OTextConnectionHelper, OnControlEditModified));
- m_pTextSeparator->SetSelectHdl(LINK(this, OTextConnectionHelper, ComboBoxSelectHdl));
- m_pCharSet->SetSelectHdl(LINK(this, OTextConnectionHelper, CharsetSelectHdl));
-
- m_pFieldSeparator->SetModifyHdl(LINK(this, OTextConnectionHelper, OnControlEditModified));
- m_pTextSeparator->SetModifyHdl(LINK(this, OTextConnectionHelper, OnControlEditModified));
- m_pDecimalSeparator->SetModifyHdl(LINK(this, OTextConnectionHelper, OnControlEditModified));
- m_pThousandsSeparator->SetModifyHdl(LINK(this, OTextConnectionHelper, OnControlEditModified));
m_pOwnExtension->SetModifyHdl(LINK(this, OTextConnectionHelper, OnEditModified));
m_pAccessTextFiles->SetToggleHdl(LINK(this, OTextConnectionHelper, OnSetExtensionHdl));
m_pAccessCSVFiles->SetToggleHdl(LINK(this, OTextConnectionHelper, OnSetExtensionHdl));
@@ -151,21 +140,6 @@ namespace dbaui
Show();
}
- IMPL_LINK_TYPED(OTextConnectionHelper, CharsetSelectHdl, ListBox&, rListBox, void)
- {
- getControlModifiedLink().Call(&rListBox);
- }
-
- IMPL_LINK_TYPED(OTextConnectionHelper, ComboBoxSelectHdl, ComboBox&, rBox, void)
- {
- getControlModifiedLink().Call(&rBox);
- }
-
- IMPL_LINK_TYPED(OTextConnectionHelper, OnControlEditModified, Edit&, rEdit, void)
- {
- getControlModifiedLink().Call(&rEdit);
- }
-
OTextConnectionHelper::~OTextConnectionHelper()
{
disposeOnce();
@@ -195,12 +169,6 @@ namespace dbaui
TabPage::dispose();
}
- IMPL_LINK(OTextConnectionHelper, OnControlModified, Control*,)
- {
- callModifiedHdl();
- return 0L;
- }
-
IMPL_LINK_NOARG_TYPED(OTextConnectionHelper, OnEditModified, Edit&, void)
{
m_aGetExtensionHandler.Call(this);
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 625758ba..c07f669d 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -44,8 +44,6 @@ namespace dbaui
{
OTextConnectionHelper();
- Link<> m_aModifiedHandler; /// to be called if something on the page has been modified
-
public:
OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections );
virtual ~OTextConnectionHelper();
@@ -80,14 +78,8 @@ namespace dbaui
short m_nAvailableSections;
protected:
- void callModifiedHdl() const { m_aModifiedHandler.Call(const_cast<OTextConnectionHelper *>(this)); }
- Link<> getControlModifiedLink() { return LINK(this, OTextConnectionHelper, OnControlModified); }
DECL_LINK_TYPED(OnSetExtensionHdl,RadioButton&,void);
- DECL_LINK(OnControlModified,Control*);
- DECL_LINK_TYPED(OnControlEditModified, Edit&, void);
DECL_LINK_TYPED(OnEditModified, Edit&, void);
- DECL_LINK_TYPED(CharsetSelectHdl,ListBox&,void);
- DECL_LINK_TYPED(ComboBoxSelectHdl,ComboBox&,void);
private:
OUString GetSeparator( const ComboBox& rBox, const OUString& rList );
commit 59418d8eac185a54a181c1300e8dca66170def4d
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 16 15:09:47 2015 +0200
convert Link<> to typed
Change-Id: I66ad4562f33b68172557d759a26b9e19d19e2c0e
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index c591761..8ace458 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -100,10 +100,9 @@ namespace pcr
setModified();
}
- IMPL_LINK_NOARG( CommonBehaviourControlHelper, ModifiedHdl )
+ IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, ModifiedHdl, ListBox&, void )
{
setModified();
- return 0;
}
IMPL_LINK_NOARG_TYPED( CommonBehaviourControlHelper, GetFocusHdl, Control&, void )
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index fc39aec..5fe2e99 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -89,9 +89,8 @@ namespace pcr
virtual vcl::Window* getVclWindow() = 0;
/// may be used by derived classes, they forward the event to the PropCtrListener
- DECL_LINK( ModifiedHdl, void* );
+ DECL_LINK_TYPED( ModifiedHdl, ListBox&, void );
DECL_LINK_TYPED( EditModifiedHdl, Edit&, void );
- DECL_LINK_TYPED( SelectHdl, ListBox&, void );
DECL_LINK_TYPED( GetFocusHdl, Control&, void );
DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
};
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index c466597..f5422f0 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -61,10 +61,10 @@ namespace pcr
TListboxWindow::SetSelectHdl( LINK(this, ListLikeControlWithModifyHandler, OnSelect) );
}
- void SetModifyHdl( const Link<>& _rLink ) { aModifyHdl = _rLink;; }
+ void SetModifyHdl( const Link<ListBox&,void>& _rLink ) { aModifyHdl = _rLink;; }
private:
DECL_LINK_TYPED(OnSelect, ListBox&, void);
- Link<> aModifyHdl;
+ Link<ListBox&,void> aModifyHdl;
};
template< class LISTBOX_WINDOW >
@@ -74,7 +74,7 @@ namespace pcr
template< class LISTBOX_WINDOW >
void ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::OnSelect(ListBox& rListBox)
{
- aModifyHdl.Call(&rListBox);
+ aModifyHdl.Call(rListBox);
}
//= OTimeControl
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index a11962a..ed0dd6d 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -56,7 +56,7 @@ namespace pcr
{
SetText( "" );
if ( m_pHelper )
- m_pHelper->ModifiedHdl( this );
+ m_pHelper->setModified();
return true;
}
}
commit 137208746e05941d06d931e4d0446011c6faad03
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 16 15:03:12 2015 +0200
convert Link<> to typed
Change-Id: I8c00bcdb718bcebbb15e24e1c1622cdc6b356787
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 246a25f..ae44fc5 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -69,14 +69,14 @@ namespace pcr
VclPtr<ComboBox> m_pDetailColumn;
VclPtr<ComboBox> m_pMasterColumn;
- Link<> m_aLinkChangeHandler;
+ Link<FieldLinkRow&,void> m_aLinkChangeHandler;
public:
explicit FieldLinkRow( vcl::Window* _pParent );
virtual ~FieldLinkRow();
virtual void dispose() override;
- inline void SetLinkChangeHandler( const Link<>& _rHdl ) { m_aLinkChangeHandler = _rHdl; }
+ inline void SetLinkChangeHandler( const Link<FieldLinkRow&,void>& _rHdl ) { m_aLinkChangeHandler = _rHdl; }
enum LinkParticipant
{
@@ -149,7 +149,7 @@ namespace pcr
IMPL_LINK_NOARG_TYPED( FieldLinkRow, OnFieldNameChanged, Edit&, void )
{
- m_aLinkChangeHandler.Call( this );
+ m_aLinkChangeHandler.Call( *this );
}
VCL_BUILDER_FACTORY(FieldLinkRow)
@@ -663,10 +663,9 @@ namespace pcr
}
- IMPL_LINK( FormLinkDialog, OnFieldChanged, FieldLinkRow*, /*_pRow*/ )
+ IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void )
{
updateOkButton();
- return 0L;
}
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 21699d1..b341cd0 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -87,7 +87,7 @@ namespace pcr
private:
DECL_LINK_TYPED( OnSuggest, Button*, void );
- DECL_LINK( OnFieldChanged, FieldLinkRow* );
+ DECL_LINK_TYPED( OnFieldChanged, FieldLinkRow&, void );
DECL_LINK_TYPED( OnInitialize, void*, void);
void updateOkButton();
commit 72f5baa8b70b2e31af2078cd647064eaf30795b6
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 16 15:01:13 2015 +0200
remove unused header file
Change-Id: Icfd6c9a23d6d6f4f8b4ee8462134a3b08573fe50
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
deleted file mode 100644
index 942ee304..0000000
--- a/sc/source/ui/inc/funcpage.hxx
+++ /dev/null
@@ -1,94 +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 .
- */
-
-#ifndef INCLUDED_SC_SOURCE_UI_INC_FUNCPAGE_HXX
-#define INCLUDED_SC_SOURCE_UI_INC_FUNCPAGE_HXX
-
-#include "funcutl.hxx"
-#include "global.hxx"
-#include <svtools/stdctrl.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/group.hxx>
-#include <svtools/svmedit.hxx>
-#include <vcl/tabpage.hxx>
-
-#include <vcl/tabctrl.hxx>
-#include "parawin.hxx"
-#include <svtools/treelistbox.hxx>
-#include "compiler.hxx"
-
-class ScFuncDesc;
-
-#define LRU_MAX 10
-
-class ScListBox : public ListBox
-{
-protected:
-
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual bool PreNotify( NotifyEvent& rNEvt );
-
-public:
- ScListBox( vcl::Window* pParent, const ResId& rResId );
-};
-
-class ScFuncPage : public TabPage
-{
-private:
-
- Link<> aSelectionLink;
- FixedText aFtCategory;
- ListBox aLbCategory;
- FixedText aFtFunction;
- ScListBox aLbFunction;
- ImageButton aIBFunction;
-
- const ScFuncDesc* aLRUList[LRU_MAX];
-
- DECL_LINK_TYPED( SelHdl, ListBox&, void );
- DECL_LINK_TYPED( DblClkHdl, ListBox&, void );
-
-protected:
-
- void UpdateFunctionList();
- void InitLRUList();
-
-public:
-
- ScFuncPage( vcl::Window* pParent);
-
- void SetCategory(sal_uInt16 nCat);
- void SetFunction(sal_uInt16 nFunc);
- void SetFocus();
- sal_uInt16 GetCategory();
- sal_uInt16 GetFunction();
- sal_uInt16 GetFunctionEntryCount();
-
- sal_uInt16 GetFuncPos(const ScFuncDesc*);
- const ScFuncDesc* GetFuncDesc( sal_uInt16 nPos ) const;
- OUString GetSelFunctionName() const;
-
- void SetSelectHdl( const Link<>& rLink ) { aSelectionLink = rLink; }
- const Link<>& GetSelectHdl() const { return aSelectionLink; }
-
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9cfa28727290d84eb83486fe0f926441e16cc5bd
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 16 14:59:11 2015 +0200
convert Link<> to typed
Change-Id: I04987cc8c3eab52a7191d75cf0a9cde9049bfbd4
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 9113671..3ec8329 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -112,7 +112,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
}
}
if(nCount)
- EntrySelectHdl(maEntries[0].get());
+ EntrySelectHdl(*maEntries[0].get());
}
else
{
@@ -388,10 +388,10 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void )
RecalcAll();
}
-IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry )
+IMPL_LINK_TYPED( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, void )
{
- if(pEntry->IsSelected())
- return 0;
+ if(rEntry.IsSelected())
+ return;
//A child has focus, but we will hide that, so regrab to whatever new thing gets
//shown instead of leaving it stuck in the inaccessible hidden element
@@ -401,11 +401,10 @@ IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry )
(*itr)->SetInactive();
}
mpDialogParent->InvalidateRefData();
- pEntry->SetActive();
+ rEntry.SetActive();
RecalcAll();
if (bReGrabFocus)
GrabFocus();
- return 0;
}
IMPL_LINK_NOARG_TYPED( ScCondFormatList, ScrollHdl, ScrollBar*, void )
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 5edd574..d8cdaa1 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -78,7 +78,7 @@ bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN )
{
- ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, [this] () { maClickHdl.Call(this); } );
+ ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, [this] () { maClickHdl.Call(*this); } );
}
return Control::Notify(rNEvt);
}
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 6d9f3ae..212b204 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -89,7 +89,7 @@ public:
DECL_LINK_TYPED( AddBtnHdl, Button*, void );
DECL_LINK_TYPED( RemoveBtnHdl, Button*, void );
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
- DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* );
+ DECL_LINK_TYPED( EntrySelectHdl, ScCondFrmtEntry&, void );
DECL_LINK_TYPED( TypeListHdl, ListBox&, void );
DECL_LINK_TYPED( AfterTypeListHdl, void*, void );
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 876faa6..5c77a0e 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -43,7 +43,7 @@ class ScCondFrmtEntry : public Control
private:
bool mbActive;
- Link<> maClickHdl;
+ Link<ScCondFrmtEntry&,void> maClickHdl;
//general ui elements
VclPtr<FixedText> maFtCondNr;
commit 1ff755309e1b9d660f85fc33e41dee832b76dd45
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 16 14:50:31 2015 +0200
convert Link<> to typed
Change-Id: I178acd3bd0e16a6b6c84162269a3771d6b898b25
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index f0d019b..e8810c3 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -99,7 +99,7 @@ namespace sd {
class PresetPropertyBox : public PropertySubControl
{
public:
- PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<>& rModifyHdl );
+ PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~PresetPropertyBox();
virtual Any getValue() override;
@@ -110,10 +110,10 @@ private:
std::map< sal_uInt16, OUString > maPropertyValues;
VclPtr<ListBox> mpControl;
DECL_LINK_TYPED(OnSelect, ListBox&, void);
- Link<> maModifyLink;
+ Link<LinkParamNone*,void> maModifyLink;
};
-PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<>& rModifyHdl )
+PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
{
mpControl = VclPtr<ListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
@@ -124,9 +124,9 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pPare
setValue( rValue, aPresetId );
}
-IMPL_LINK_TYPED(PresetPropertyBox, OnSelect, ListBox&, rListBox, void)
+IMPL_LINK_NOARG_TYPED(PresetPropertyBox, OnSelect, ListBox&, void)
{
- maModifyLink.Call(&rListBox);
+ maModifyLink.Call(nullptr);
}
void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
@@ -182,7 +182,7 @@ Control* PresetPropertyBox::getControl()
class ColorPropertyBox : public PropertySubControl
{
public:
- ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
+ ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~ColorPropertyBox();
virtual Any getValue() override;
@@ -192,10 +192,10 @@ public:
private:
VclPtr<ColorListBox> mpControl;
DECL_LINK_TYPED(OnSelect, ListBox&, void);
- Link<> maModifyLink;
+ Link<LinkParamNone*,void> maModifyLink;
};
-ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
+ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
{
mpControl = VclPtr<ColorListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
@@ -226,9 +226,9 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
}
}
-IMPL_LINK_TYPED(ColorPropertyBox, OnSelect, ListBox&, rListBox, void)
+IMPL_LINK_NOARG_TYPED(ColorPropertyBox, OnSelect, ListBox&, void)
{
- maModifyLink.Call(&rListBox);
+ maModifyLink.Call(nullptr);
}
ColorPropertyBox::~ColorPropertyBox()
@@ -261,7 +261,7 @@ Control* ColorPropertyBox::getControl()
class FontPropertyBox : public PropertySubControl
{
public:
- FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
+ FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~FontPropertyBox();
virtual Any getValue() override;
@@ -270,12 +270,12 @@ public:
virtual Control* getControl() override;
private:
- VclPtr<FontNameBox> mpControl;
- Link<> maModifyHdl;
+ VclPtr<FontNameBox> mpControl;
+ Link<LinkParamNone*,void> maModifyHdl;
DECL_LINK_TYPED(ControlSelectHdl, ComboBox&, void);
};
-FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
+FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType ), maModifyHdl(rModifyHdl)
{
mpControl = VclPtr<FontNameBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
@@ -307,9 +307,9 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent,
setValue( rValue, aPresetId );
}
-IMPL_LINK_TYPED(FontPropertyBox, ControlSelectHdl, ComboBox&, rBox, void)
+IMPL_LINK_NOARG_TYPED(FontPropertyBox, ControlSelectHdl, ComboBox&, void)
{
- maModifyHdl.Call(&rBox);
+ maModifyHdl.Call(nullptr);
}
void FontPropertyBox::setValue( const Any& rValue, const OUString& )
@@ -422,7 +422,7 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
class CharHeightPropertyBox : public PropertySubControl
{
public:
- CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
+ CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~CharHeightPropertyBox();
virtual Any getValue() override;
@@ -437,10 +437,10 @@ private:
VclPtr<DropdownMenuBox> mpControl;
PopupMenu* mpMenu;
VclPtr<MetricField> mpMetric;
- Link<> maModifyHdl;
+ Link<LinkParamNone*,void> maModifyHdl;
};
-CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
+CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType ), maModifyHdl(rModifyHdl)
{
mpMetric.set( VclPtr<MetricField>::Create( pParent, WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) );
@@ -463,9 +463,9 @@ CharHeightPropertyBox::~CharHeightPropertyBox()
mpControl.disposeAndClear();
}
-IMPL_LINK_TYPED( CharHeightPropertyBox, EditModifyHdl, Edit&, rEdit, void )
+IMPL_LINK_NOARG_TYPED( CharHeightPropertyBox, EditModifyHdl, Edit&, void )
{
- maModifyHdl.Call(&rEdit);
+ maModifyHdl.Call(nullptr);
}
IMPL_LINK_TYPED( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
@@ -505,7 +505,7 @@ Control* CharHeightPropertyBox::getControl()
class TransparencyPropertyBox : public PropertySubControl
{
public:
- TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
+ TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~TransparencyPropertyBox();
virtual Any getValue() override;
@@ -519,13 +519,13 @@ public:
void updateMenu();
private:
- VclPtr<DropdownMenuBox> mpControl;
- PopupMenu* mpMenu;
- VclPtr<MetricField> mpMetric;
- Link<> maModifyHdl;
+ VclPtr<DropdownMenuBox> mpControl;
+ PopupMenu* mpMenu;
+ VclPtr<MetricField> mpMetric;
+ Link<LinkParamNone*,void> maModifyHdl;
};
-TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
+TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -568,7 +568,7 @@ void TransparencyPropertyBox::updateMenu()
IMPL_LINK_NOARG_TYPED(TransparencyPropertyBox, implModifyHdl, Edit&, void)
{
updateMenu();
- maModifyHdl.Call(mpMetric.get());
+ maModifyHdl.Call(nullptr);
}
IMPL_LINK_TYPED( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
@@ -605,7 +605,7 @@ Control* TransparencyPropertyBox::getControl()
class RotationPropertyBox : public PropertySubControl
{
public:
- RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
+ RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~RotationPropertyBox();
virtual Any getValue() override;
@@ -619,13 +619,13 @@ public:
void updateMenu();
private:
- VclPtr<DropdownMenuBox> mpControl;
- PopupMenu* mpMenu;
- VclPtr<MetricField> mpMetric;
- Link<> maModifyHdl;
+ VclPtr<DropdownMenuBox> mpControl;
+ PopupMenu* mpMenu;
+ VclPtr<MetricField> mpMetric;
+ Link<LinkParamNone*,void> maModifyHdl;
};
-RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
+RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -670,7 +670,7 @@ void RotationPropertyBox::updateMenu()
IMPL_LINK_NOARG_TYPED(RotationPropertyBox, implModifyHdl, Edit&, void)
{
updateMenu();
- maModifyHdl.Call(mpMetric.get());
+ maModifyHdl.Call(nullptr);
}
IMPL_LINK_TYPED( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
@@ -726,7 +726,7 @@ Control* RotationPropertyBox::getControl()
class ScalePropertyBox : public PropertySubControl
{
public:
- ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
+ ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~ScalePropertyBox();
virtual Any getValue() override;
@@ -740,14 +740,14 @@ public:
void updateMenu();
private:
- VclPtr<DropdownMenuBox> mpControl;
- PopupMenu* mpMenu;
- VclPtr<MetricField> mpMetric;
- Link<> maModifyHdl;
- int mnDirection;
+ VclPtr<DropdownMenuBox> mpControl;
+ PopupMenu* mpMenu;
+ VclPtr<MetricField> mpMetric;
+ Link<LinkParamNone*,void> maModifyHdl;
+ int mnDirection;
};
-ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
+ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -790,7 +790,7 @@ void ScalePropertyBox::updateMenu()
IMPL_LINK_NOARG_TYPED(ScalePropertyBox, implModifyHdl, Edit&, void)
{
updateMenu();
- maModifyHdl.Call(mpMetric.get());
+ maModifyHdl.Call(nullptr);
}
IMPL_LINK_TYPED( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
@@ -885,7 +885,7 @@ Control* ScalePropertyBox::getControl()
class FontStylePropertyBox : public PropertySubControl
{
public:
- FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl );
+ FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl );
virtual ~FontStylePropertyBox();
virtual Any getValue() override;
@@ -898,17 +898,17 @@ public:
void update();
private:
- VclPtr<DropdownMenuBox> mpControl;
- PopupMenu* mpMenu;
- VclPtr<Edit> mpEdit;
- Link<> maModifyHdl;
+ VclPtr<DropdownMenuBox> mpControl;
+ PopupMenu* mpMenu;
+ VclPtr<Edit> mpEdit;
+ Link<LinkParamNone*,void> maModifyHdl;
float mfFontWeight;
awt::FontSlant meFontSlant;
sal_Int16 mnFontUnderline;
};
-FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
+FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
: PropertySubControl( nControlType )
, maModifyHdl( rModifyHdl )
{
@@ -972,7 +972,7 @@ IMPL_LINK_TYPED( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void
}
update();
- maModifyHdl.Call(mpEdit.get());
+ maModifyHdl.Call(nullptr);
}
void FontStylePropertyBox::setValue( const Any& rValue, const OUString& )
@@ -1125,9 +1125,8 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent
// get property value
const Any aValue( pSet->getPropertyValue( nHandleProperty1Value ) );
- Link<> aModifyLink;
// create property sub control
- mpLBProperty1->setSubControl( PropertySubControl::create( nType, mpPlaceholderBox, aValue, aPresetId, aModifyLink ));
+ mpLBProperty1->setSubControl( PropertySubControl::create( nType, mpPlaceholderBox, aValue, aPresetId, Link<LinkParamNone*,void>() ));
}
}
@@ -2368,7 +2367,7 @@ PropertySubControl::~PropertySubControl()
{
}
-PropertySubControl* PropertySubControl::create( sal_Int32 nType, vcl::Window* pParent, const Any& rValue, const OUString& rPresetId, const Link<>& rModifyHdl )
+PropertySubControl* PropertySubControl::create( sal_Int32 nType, vcl::Window* pParent, const Any& rValue, const OUString& rPresetId, const Link<LinkParamNone*,void>& rModifyHdl )
{
PropertySubControl* pSubControl = NULL;
switch( nType )
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index dce331b..0f82354 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -110,7 +110,7 @@ public:
vcl::Window* pParent,
const ::com::sun::star::uno::Any& rValue,
const OUString& rPresetId,
- const Link<>& rModifyHdl );
+ const Link<LinkParamNone*,void>& rModifyHdl );
sal_Int32 getControlType() const { return mnType; }
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 463a1aa..9baee5b 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2010,10 +2010,9 @@ void CustomAnimationPane::onChangeSpeed()
}
/// this link is called when the property box is modified by the user
-IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl)
+IMPL_LINK_NOARG_TYPED(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void)
{
onChangeProperty();
- return 0;
}
IMPL_LINK_TYPED( CustomAnimationPane, implClickHdl, Button*, pBtn, void )
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 0d08587..0144c54 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -118,9 +118,9 @@ private:
DECL_LINK_TYPED( implControlListBoxHdl, ListBox&, void );
DECL_LINK_TYPED( implClickHdl, Button*, void );
- DECL_LINK(implPropertyHdl, void *);
- DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
- DECL_LINK_TYPED(lateInitCallback, Timer *, void);
+ DECL_LINK_TYPED( implPropertyHdl, LinkParamNone*, void );
+ DECL_LINK_TYPED( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
+ DECL_LINK_TYPED( lateInitCallback, Timer *, void );
void implControlHdl(Control*);
private:
More information about the Libreoffice-commits
mailing list