diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /starmath/inc/dialog.hxx | |
parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) |
Remove _TYPED suffix from tools/link.hxx macros
...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
Diffstat (limited to 'starmath/inc/dialog.hxx')
-rw-r--r-- | starmath/inc/dialog.hxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 4c15ed3d8399..f5a5621980dc 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -63,7 +63,7 @@ class SmPrintOptionsTabPage : public SfxTabPage VclPtr<CheckBox> m_pSaveOnlyUsedSymbols; VclPtr<CheckBox> m_pAutoCloseBrackets; - DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void); + DECL_LINK(SizeButtonClickHdl, Button *, void); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -103,9 +103,9 @@ class SmFontDialog : public ModalDialog vcl::Font maFont; - DECL_LINK_TYPED(FontSelectHdl, ComboBox&, void); - DECL_LINK_TYPED(FontModifyHdl, Edit&, void); - DECL_LINK_TYPED(AttrChangeHdl, Button *, void); + DECL_LINK(FontSelectHdl, ComboBox&, void); + DECL_LINK(FontModifyHdl, Edit&, void); + DECL_LINK(AttrChangeHdl, Button *, void); virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; @@ -133,7 +133,7 @@ class SmFontSizeDialog : public ModalDialog VclPtr<MetricField> m_pBorderSize; VclPtr<PushButton> m_pDefaultButton; - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); + DECL_LINK(DefaultButtonClickHdl, Button *, void); public: SmFontSizeDialog(vcl::Window *pParent); @@ -160,8 +160,8 @@ class SmFontTypeDialog : public ModalDialog VclPtr<OutputDevice> pFontListDev; - DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool); - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); + DECL_LINK(MenuSelectHdl, Menu *, bool); + DECL_LINK(DefaultButtonClickHdl, Button *, void); public: SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice); @@ -223,10 +223,10 @@ class SmDistanceDialog : public ModalDialog sal_uInt16 nActiveCategory; bool bScaleAllBrackets; - DECL_LINK_TYPED(GetFocusHdl, Control&, void); - DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool); - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); - DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void); + DECL_LINK(GetFocusHdl, Control&, void); + DECL_LINK(MenuSelectHdl, Menu *, bool); + DECL_LINK(DefaultButtonClickHdl, Button *, void); + DECL_LINK(CheckBoxClickHdl, Button *, void); using Window::SetHelpId; static void SetHelpId(MetricField &rField, const OString& sHelpId); @@ -255,7 +255,7 @@ class SmAlignDialog : public ModalDialog VclPtr<RadioButton> m_pRight; VclPtr<PushButton> m_pDefaultButton; - DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); + DECL_LINK(DefaultButtonClickHdl, Button *, void); public: SmAlignDialog(vcl::Window *pParent); @@ -288,7 +288,7 @@ class SmShowSymbolSetWindow : public Control virtual void Resize() override; virtual Size GetOptimalSize() const override; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); public: SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle); virtual ~SmShowSymbolSetWindow() override; @@ -361,12 +361,12 @@ class SmSymbolDialog : public ModalDialog VclPtr<OutputDevice> pFontListDev; - DECL_LINK_TYPED(SymbolSetChangeHdl, ListBox&, void); - DECL_LINK_TYPED(SymbolChangeHdl, SmShowSymbolSetWindow&, void); - DECL_LINK_TYPED(SymbolDblClickHdl, SmShowSymbol&, void); - DECL_LINK_TYPED(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void); - DECL_LINK_TYPED(EditClickHdl, Button*, void); - DECL_LINK_TYPED(GetClickHdl, Button*, void); + DECL_LINK(SymbolSetChangeHdl, ListBox&, void); + DECL_LINK(SymbolChangeHdl, SmShowSymbolSetWindow&, void); + DECL_LINK(SymbolDblClickHdl, SmShowSymbol&, void); + DECL_LINK(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void); + DECL_LINK(EditClickHdl, Button*, void); + DECL_LINK(GetClickHdl, Button*, void); void SymbolDblClickHdl(); void FillSymbolSets(); @@ -429,16 +429,16 @@ class SmSymDefineDialog : public ModalDialog std::unique_ptr<SubsetMap> pSubsetMap; FontList *pFontList; - DECL_LINK_TYPED(OldSymbolChangeHdl, ComboBox&, void); - DECL_LINK_TYPED(OldSymbolSetChangeHdl, ComboBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(FontChangeHdl, ListBox&, void); - DECL_LINK_TYPED(SubsetChangeHdl, ListBox&, void); - DECL_LINK_TYPED(StyleChangeHdl, ComboBox&, void); - DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(AddClickHdl, Button *, void); - DECL_LINK_TYPED(ChangeClickHdl, Button *, void); - DECL_LINK_TYPED(DeleteClickHdl, Button *, void); + DECL_LINK(OldSymbolChangeHdl, ComboBox&, void); + DECL_LINK(OldSymbolSetChangeHdl, ComboBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(FontChangeHdl, ListBox&, void); + DECL_LINK(SubsetChangeHdl, ListBox&, void); + DECL_LINK(StyleChangeHdl, ComboBox&, void); + DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); + DECL_LINK(AddClickHdl, Button *, void); + DECL_LINK(ChangeClickHdl, Button *, void); + DECL_LINK(DeleteClickHdl, Button *, void); void FillSymbols(ComboBox &rComboBox, bool bDeleteText = true); void FillSymbolSets(ComboBox &rComboBox, bool bDeleteText = true); |