Kaydet (Commit) 08e7bc6a authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Iea90c0e46902936bde3b51475292999fa0ead934
üst 945965e5
......@@ -248,7 +248,7 @@ IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox
m_pWizard->UpdateRoadmap();
}
IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl)
IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkParamNone*, void)
{
const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress();
const uno::Sequence< OUString> aBlocks =
......@@ -258,7 +258,6 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl)
m_pWizard->GetConfigItem().SetCurrentAddressBlockIndex( nSel );
GetWizard()->UpdateRoadmap();
GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
return 0;
}
IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, Button*, pBox, void)
......
......@@ -68,7 +68,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
DECL_LINK_TYPED(AssignHdl_Impl, Button*, void);
DECL_LINK_TYPED(AddressBlockHdl_Impl, Button*, void);
DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void);
DECL_LINK(AddressBlockSelectHdl_Impl, void *);
DECL_LINK_TYPED(AddressBlockSelectHdl_Impl, LinkParamNone*, void);
DECL_LINK_TYPED(HideParagraphsHdl_Impl, Button*, void);
void EnableAddressBlock(bool bAll, bool bSelective);
......
......@@ -379,7 +379,7 @@ void SwAddressPreview::MouseButtonDown( const MouseEvent& rMEvt )
pImpl->nSelectedAddress != (sal_uInt16)nSelect)
{
pImpl->nSelectedAddress = (sal_uInt16)nSelect;
m_aSelectHdl.Call(this);
m_aSelectHdl.Call(nullptr);
}
Invalidate();
}
......@@ -422,7 +422,7 @@ void SwAddressPreview::KeyInput( const KeyEvent& rKEvt )
pImpl->nSelectedAddress != (sal_uInt16)nSelect)
{
pImpl->nSelectedAddress = (sal_uInt16)nSelect;
m_aSelectHdl.Call(this);
m_aSelectHdl.Call(nullptr);
Invalidate();
}
}
......
......@@ -61,7 +61,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window
{
VclPtr<ScrollBar> aVScrollBar;
SwAddressPreview_Impl* pImpl;
Link<> m_aSelectHdl;
Link<LinkParamNone*,void> m_aSelectHdl;
void DrawText_Impl(vcl::RenderContext& rRenderContext, const OUString& rAddress,
const Point& rTopLeft, const Size& rSize, bool bIsSelected);
......@@ -109,7 +109,7 @@ public:
static OUString FillData(const OUString& rAddress, SwMailMergeConfigItem& rConfigItem,
const css::uno::Sequence<OUString>* pAssignments = 0);
void SetSelectHdl (const Link<>& rLink) { m_aSelectHdl = rLink; }
void SetSelectHdl (const Link<LinkParamNone*,void>& rLink) { m_aSelectHdl = rLink; }
};
// iterate over an address block or a greeting line the iterator returns the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment