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

convert Link<> to typed

Browse Source 
Change-Id: I1d8fe58c589b56590453b2136296ca50bfe78252
This commit is contained in:
Noel Grandin
2015-10-19 13:29:13 +02:00
parent 2e5427ce81
commit c4484a8225
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cui/source/dialogs/cuigrfflt.cxx
View File

@@ -123,7 +123,7 @@ void GraphicPreviewWindow::ScaleImageToFit()
} }
} }
maModifyHdl.Call(this); maModifyHdl.Call(nullptr);
} }
void GraphicPreviewWindow::Resize() void GraphicPreviewWindow::Resize()
@@ -170,15 +170,13 @@ IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void)
IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
{ {
if (bIsBitmap) if (bIsBitmap)
{ {
maTimer.Stop(); maTimer.Stop();
maTimer.Start(); maTimer.Start();
} }
return 0;
} }
@@ -208,14 +206,14 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r
mpMtrWidth->GrabFocus(); mpMtrWidth->GrabFocus();
} }
IMPL_LINK_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, rCheckBox, void) IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void)
{ {
GetModifyHdl().Call(&rCheckBox); GetModifyHdl().Call(nullptr);
} }
IMPL_LINK_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, rEdit, void) IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, void)
{ {
GetModifyHdl().Call(&rEdit); GetModifyHdl().Call(nullptr);
} }
GraphicFilterMosaic::~GraphicFilterMosaic() GraphicFilterMosaic::~GraphicFilterMosaic()
@@ -282,9 +280,9 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r
mpMtrRadius->GrabFocus(); mpMtrRadius->GrabFocus();
} }
IMPL_LINK_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, rEdit, void) IMPL_LINK_NOARG_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, void)
{ {
GetModifyHdl().Call(&rEdit); GetModifyHdl().Call(nullptr);
} }
GraphicFilterSmooth::~GraphicFilterSmooth() GraphicFilterSmooth::~GraphicFilterSmooth()
@@ -345,13 +343,13 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi
mpCbxInvert->SetToggleHdl( LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl) ); mpCbxInvert->SetToggleHdl( LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl) );
} }
IMPL_LINK_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, rCheckBox, void) IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void)
{ {
GetModifyHdl().Call(&rCheckBox); GetModifyHdl().Call(nullptr);
} }
IMPL_LINK_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, rEdit, void) IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, void)
{ {
GetModifyHdl().Call(&rEdit); GetModifyHdl().Call(nullptr);
} }
GraphicFilterSolarize::~GraphicFilterSolarize() GraphicFilterSolarize::~GraphicFilterSolarize()
@@ -416,9 +414,9 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr
mpMtrSepia->SetModifyHdl( LINK(this, GraphicFilterSepia, EditModifyHdl) ); mpMtrSepia->SetModifyHdl( LINK(this, GraphicFilterSepia, EditModifyHdl) );
} }
IMPL_LINK_TYPED(GraphicFilterSepia, EditModifyHdl, Edit&, rEdit, void) IMPL_LINK_NOARG_TYPED(GraphicFilterSepia, EditModifyHdl, Edit&, void)
{ {
GetModifyHdl().Call(&rEdit); GetModifyHdl().Call(nullptr);
} }
GraphicFilterSepia::~GraphicFilterSepia() GraphicFilterSepia::~GraphicFilterSepia()
@@ -474,9 +472,9 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG
mpNumPoster->SetModifyHdl( LINK(this, GraphicFilterPoster, EditModifyHdl) ); mpNumPoster->SetModifyHdl( LINK(this, GraphicFilterPoster, EditModifyHdl) );
} }
IMPL_LINK_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, rEdit, void) IMPL_LINK_NOARG_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, void)
{ {
GetModifyHdl().Call(&rEdit); GetModifyHdl().Call(nullptr);
} }
GraphicFilterPoster::~GraphicFilterPoster() GraphicFilterPoster::~GraphicFilterPoster()
@@ -526,7 +524,7 @@ void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
SvxRectCtl::MouseButtonDown( rEvt ); SvxRectCtl::MouseButtonDown( rEvt );
if( GetActualRP() != eOldRP ) if( GetActualRP() != eOldRP )
maModifyHdl.Call( this ); maModifyHdl.Call( nullptr );
} }
Size EmbossControl::GetOptimalSize() const Size EmbossControl::GetOptimalSize() const

16
cui/source/inc/cuigrfflt.hxx
View File

@@ -36,7 +36,7 @@ class GraphicPreviewWindow : public Control
{ {
private: private:
const Graphic* mpOrigGraphic; const Graphic* mpOrigGraphic;
Link<> maModifyHdl; Link<LinkParamNone*,void> maModifyHdl;
Graphic maScaledOrig; Graphic maScaledOrig;
Graphic maPreview; Graphic maPreview;
double mfScaleX; double mfScaleX;
@@ -51,7 +51,7 @@ private:
public: public:
GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle); GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle);
void init(const Graphic* pOrigGraphic, const Link<>& rLink) void init(const Graphic* pOrigGraphic, const Link<LinkParamNone*,void>& rLink)
{ {
mpOrigGraphic = pOrigGraphic; mpOrigGraphic = pOrigGraphic;
maModifyHdl = rLink; maModifyHdl = rLink;
@@ -69,17 +69,17 @@ class GraphicFilterDialog : public ModalDialog
private: private:
Timer maTimer; Timer maTimer;
Link<> maModifyHdl; Link<LinkParamNone*,void> maModifyHdl;
Size maSizePixel; Size maSizePixel;
bool bIsBitmap; bool bIsBitmap;
DECL_LINK_TYPED(ImplPreviewTimeoutHdl, Timer *, void); DECL_LINK_TYPED( ImplPreviewTimeoutHdl, Timer *, void );
DECL_LINK( ImplModifyHdl, void* ); DECL_LINK_TYPED( ImplModifyHdl, LinkParamNone*, void);
protected: protected:
VclPtr<GraphicPreviewWindow> mpPreview; VclPtr<GraphicPreviewWindow> mpPreview;
const Link<>& GetModifyHdl() const { return maModifyHdl; } const Link<LinkParamNone*,void>& GetModifyHdl() const { return maModifyHdl; }
const Size& GetGraphicSizePixel() const { return maSizePixel; } const Size& GetGraphicSizePixel() const { return maSizePixel; }
public: public:
@@ -183,14 +183,14 @@ public:
class EmbossControl : public SvxRectCtl class EmbossControl : public SvxRectCtl
{ {
private: private:
Link<> maModifyHdl; Link<LinkParamNone*, void> maModifyHdl;
virtual void MouseButtonDown( const MouseEvent& rEvt ) override; virtual void MouseButtonDown( const MouseEvent& rEvt ) override;
virtual Size GetOptimalSize() const override; virtual Size GetOptimalSize() const override;
public: public:
EmbossControl(vcl::Window* pParent) EmbossControl(vcl::Window* pParent)
: SvxRectCtl(pParent) {} : SvxRectCtl(pParent) {}
void SetModifyHdl( const Link<>& rHdl ) { maModifyHdl = rHdl; } void SetModifyHdl( const Link<LinkParamNone*,void>& rHdl ) { maModifyHdl = rHdl; }
}; };
class GraphicFilterEmboss : public GraphicFilterDialog class GraphicFilterEmboss : public GraphicFilterDialog