Kaydet (Commit) 2db5b484 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I17104bc529d67ca816415025d14e8e26c2531b29
üst fcb55127
...@@ -36,8 +36,8 @@ friend class ImpItemEdit; ...@@ -36,8 +36,8 @@ friend class ImpItemEdit;
long nAktPaintRow; long nAktPaintRow;
VclPtr<Edit> pEditControl; VclPtr<Edit> pEditControl;
OUString aWNamMerk; OUString aWNamMerk;
Link<> aEntryChangedHdl; Link<_SdrItemBrowserControl&,void> aEntryChangedHdl;
Link<> aSetDirtyHdl; Link<_SdrItemBrowserControl&,void> aSetDirtyHdl;
ImpItemListRow* pAktChangeEntry; ImpItemListRow* pAktChangeEntry;
long nLastWhichOfs; long nLastWhichOfs;
sal_uInt16 nLastWhich; sal_uInt16 nLastWhich;
...@@ -90,8 +90,8 @@ public: ...@@ -90,8 +90,8 @@ public:
const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
OUString GetNewEntryValue() const { return pEditControl->GetText(); } OUString GetNewEntryValue() const { return pEditControl->GetText(); }
void SetEntryChangedHdl(const Link<>& rLink) { aEntryChangedHdl=rLink; } void SetEntryChangedHdl(const Link<_SdrItemBrowserControl&,void>& rLink) { aEntryChangedHdl=rLink; }
void SetSetDirtyHdl(const Link<>& rLink) { aSetDirtyHdl=rLink; } void SetSetDirtyHdl(const Link<_SdrItemBrowserControl&,void>& rLink) { aSetDirtyHdl=rLink; }
}; };
#define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE) #define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
...@@ -118,8 +118,8 @@ class SdrItemBrowser: public _SdrItemBrowserWindow { ...@@ -118,8 +118,8 @@ class SdrItemBrowser: public _SdrItemBrowserWindow {
private: private:
static vcl::Window* ImpGetViewWin(SdrView& rView); static vcl::Window* ImpGetViewWin(SdrView& rView);
DECL_LINK_TYPED(IdleHdl, Idle *, void); DECL_LINK_TYPED(IdleHdl, Idle *, void);
DECL_LINK(ChangedHdl,_SdrItemBrowserControl*); DECL_LINK_TYPED(ChangedHdl, _SdrItemBrowserControl&, void);
DECL_LINK(SetDirtyHdl, void *); DECL_LINK_TYPED(SetDirtyHdl, _SdrItemBrowserControl&, void);
public: public:
SdrItemBrowser(SdrView& rView); SdrItemBrowser(SdrView& rView);
void ForceParent(); void ForceParent();
......
...@@ -426,7 +426,7 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) ...@@ -426,7 +426,7 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
void _SdrItemBrowserControl::SetDirty() void _SdrItemBrowserControl::SetDirty()
{ {
aSetDirtyHdl.Call(this); aSetDirtyHdl.Call(*this);
} }
Rectangle _SdrItemBrowserControl::GetFieldCharacterBounds(sal_Int32 /*_nRow*/,sal_Int32 /*_nColumnPos*/,sal_Int32 /*nIndex*/) Rectangle _SdrItemBrowserControl::GetFieldCharacterBounds(sal_Int32 /*_nRow*/,sal_Int32 /*_nColumnPos*/,sal_Int32 /*nIndex*/)
...@@ -531,7 +531,7 @@ bool _SdrItemBrowserControl::EndChangeEntry() ...@@ -531,7 +531,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
{ {
bool bRet = false; bool bRet = false;
if (pEditControl!=nullptr) { if (pEditControl!=nullptr) {
aEntryChangedHdl.Call(this); aEntryChangedHdl.Call(*this);
pEditControl.disposeAndClear(); pEditControl.disposeAndClear();
delete pAktChangeEntry; delete pAktChangeEntry;
pAktChangeEntry=NULL; pAktChangeEntry=NULL;
...@@ -1145,16 +1145,16 @@ IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void) ...@@ -1145,16 +1145,16 @@ IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void)
Undirty(); Undirty();
} }
IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, void)
{ {
const ImpItemListRow* pEntry=pBrowse->GetAktChangeEntry(); const ImpItemListRow* pEntry = rBrowse.GetAktChangeEntry();
if (pEntry!=NULL) if (pEntry!=NULL)
{ {
SfxItemSet aSet(pView->GetModel()->GetItemPool()); SfxItemSet aSet(pView->GetModel()->GetItemPool());
pView->GetAttributes(aSet); pView->GetAttributes(aSet);
SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId); SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
OUString aNewText(pBrowse->GetNewEntryValue()); OUString aNewText(rBrowse.GetNewEntryValue());
bool bDel( aNewText == "del" bool bDel( aNewText == "del"
|| aNewText == "Del" || aNewText == "Del"
|| aNewText == "DEL" || aNewText == "DEL"
...@@ -1257,13 +1257,11 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) ...@@ -1257,13 +1257,11 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
} }
pView->SetAttributes(aNewSet,bDel); pView->SetAttributes(aNewSet,bDel);
} }
return 0;
} }
IMPL_LINK_NOARG(SdrItemBrowser, SetDirtyHdl) IMPL_LINK_NOARG_TYPED(SdrItemBrowser, SetDirtyHdl, _SdrItemBrowserControl&, void)
{ {
SetDirty(); SetDirty();
return 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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