Kaydet (Commit) 825b9982 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I6de6c831e7401413149100784726ce6c986f8eea
Reviewed-on: https://gerrit.libreoffice.org/18852Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst a8200ce3
......@@ -518,7 +518,7 @@ OUString AbstractSvxTransformTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
......@@ -557,7 +557,7 @@ OUString AbstractSvxCaptionDialog_Impl::GetText() const
{
return pDlg->GetText();
}
void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
......
......@@ -282,7 +282,7 @@ class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDial
class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE;
virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE;
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
......@@ -295,7 +295,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE;
virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE;
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
......
......@@ -92,7 +92,7 @@ public:
};
// class SvxCaptionTabDialog ---------------------------------------------
struct SvxSwFrameValidation;
class SvxCaptionTabDialog : public SfxTabDialog
{
private:
......@@ -102,7 +102,7 @@ private:
sal_uInt16 m_nPositionSizePageId;
sal_uInt16 m_nCaptionPageId;
Link<> aValidateLink;
Link<SvxSwFrameValidation&,void> aValidateLink;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
......@@ -111,7 +111,7 @@ public:
sal_uInt16 nAnchorTypes = 0);
/// link for the Writer to validate positions
void SetValidateFramePosLink( const Link<>& rLink );
void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );
};
......
......@@ -30,6 +30,8 @@
// SvxSwPosSizeTabPage - position and size page for Writer drawing objects
struct FrmMap;
class SdrView;
struct SvxSwFrameValidation;
class SvxSwPosSizeTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
......@@ -68,7 +70,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
VclPtr<SvxSwFrameExample> m_pExampleWN;
Link<> m_aValidateLink;
Link<SvxSwFrameValidation&,void> m_aValidateLink;
//'string provider'
SvxSwFramePosString m_aFramePosString;
......@@ -137,7 +139,7 @@ public:
void EnableAnchorTypes(sal_uInt16 nAnchorEnable);
void SetValidateFramePosLink( const Link<>& rLink )
void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{m_aValidateLink = rLink;}
void SetView( const SdrView* pSdrView );
......
......@@ -43,6 +43,7 @@ const sal_uInt16 SVX_OBJ_NORESIZE = 0x0100;
to disable the protect controls */
const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
struct SvxSwFrameValidation;
class SvxTransformTabDialog : public SfxTabDialog
{
sal_uInt16 nPosSize;
......@@ -53,7 +54,7 @@ private:
const SdrView* pView;
sal_uInt16 nAnchorCtrls;
Link<> aValidateLink;
Link<SvxSwFrameValidation&,void> aValidateLink;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
......@@ -64,7 +65,7 @@ public:
sal_uInt16 nAnchorTypes = 0);
//link for the Writer to validate positions
void SetValidateFramePosLink( const Link<>& rLink );
void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );
};
/*************************************************************************
......
......@@ -569,7 +569,7 @@ void SvxCaptionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
}
void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<>& rLink )
void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{
aValidateLink = rLink;
}
......
......@@ -1193,7 +1193,7 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void)
aVal.nHeight = nHeight;
if(m_aValidateLink.IsSet())
m_aValidateLink.Call(&aVal);
m_aValidateLink.Call(aVal);
nWidth = aVal.nWidth;
nHeight = aVal.nHeight;
......
......@@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
void SvxTransformTabDialog::SetValidateFramePosLink(const Link<>& rLink)
void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidation&,void>& rLink)
{
aValidateLink = rLink;
}
......
......@@ -216,16 +216,17 @@ class AbstractSvxAreaTabDialog :public SfxAbstractTabDialog
{
};
struct SvxSwFrameValidation;
class AbstractSvxTransformTabDialog : public SfxAbstractTabDialog
{
public:
virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0;
virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) = 0;
};
class AbstractSvxCaptionDialog : public SfxAbstractTabDialog
{
public:
virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0;
virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) = 0;
};
class AbstractSvxPostItDialog :public VclAbstractDialog
......
......@@ -31,7 +31,7 @@ struct SvxSwFrameValidation;
class SwDrawBaseShell: public SwBaseShell
{
DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* );
DECL_LINK(ValidatePosition, SvxSwFrameValidation* );
DECL_LINK_TYPED(ValidatePosition, SvxSwFrameValidation&, void );
public:
SwDrawBaseShell(SwView &rShell);
virtual ~SwDrawBaseShell();
......
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