Kaydet (Commit) 516b5115 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I822561725683231709343b80d7065c905226ebc1
üst 798d7bc0
...@@ -40,7 +40,7 @@ namespace dbaui ...@@ -40,7 +40,7 @@ namespace dbaui
class DbaMouseDownListBoxController : public ListBoxCellController class DbaMouseDownListBoxController : public ListBoxCellController
{ {
protected: protected:
Link<> m_aAdditionalModifyHdl; Link<DbaMouseDownListBoxController&,void> m_aAdditionalModifyHdl;
public: public:
explicit DbaMouseDownListBoxController(ListBoxControl* _pParent) explicit DbaMouseDownListBoxController(ListBoxControl* _pParent)
...@@ -48,21 +48,21 @@ namespace dbaui ...@@ -48,21 +48,21 @@ namespace dbaui
{ {
} }
void SetAdditionalModifyHdl(const Link<>& _rHdl); void SetAdditionalModifyHdl(const Link<DbaMouseDownListBoxController&,void>& _rHdl);
protected: protected:
virtual bool WantMouseEvent() const override { return true; } virtual bool WantMouseEvent() const override { return true; }
virtual void callModifyHdl() override; virtual void callModifyHdl() override;
}; };
void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link<>& _rHdl) void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link<DbaMouseDownListBoxController&,void>& _rHdl)
{ {
m_aAdditionalModifyHdl = _rHdl; m_aAdditionalModifyHdl = _rHdl;
} }
void DbaMouseDownListBoxController::callModifyHdl() void DbaMouseDownListBoxController::callModifyHdl()
{ {
m_aAdditionalModifyHdl.Call(nullptr); m_aAdditionalModifyHdl.Call(*this);
ListBoxCellController::callModifyHdl(); ListBoxCellController::callModifyHdl();
} }
...@@ -383,13 +383,13 @@ namespace dbaui ...@@ -383,13 +383,13 @@ namespace dbaui
} }
} }
IMPL_LINK( IndexFieldsControl, OnListEntrySelected, void*, p ) IMPL_LINK_TYPED( IndexFieldsControl, OnListEntrySelected, DbaMouseDownListBoxController&, rController, void )
{ {
ListBox* _pBox = static_cast<ListBox*>(p); ListBoxControl& rListBox = rController.GetListBox();
if (!_pBox->IsTravelSelect()) if (!rListBox.IsTravelSelect())
m_aModifyHdl.Call(this); m_aModifyHdl.Call(this);
if (_pBox == m_pFieldNameCell) if (&rListBox == m_pFieldNameCell.get())
{ // a field has been selected { // a field has been selected
if (GetCurRow() >= GetRowCount() - 2) if (GetCurRow() >= GetRowCount() - 2)
{ // and we're in one of the last two rows { // and we're in one of the last two rows
...@@ -417,7 +417,6 @@ namespace dbaui ...@@ -417,7 +417,6 @@ namespace dbaui
SaveModified(); SaveModified();
} }
return 0L;
} }
OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
{ {
......
...@@ -28,10 +28,12 @@ ...@@ -28,10 +28,12 @@
namespace dbaui namespace dbaui
{ {
class DbaMouseDownListBoxController;
// IndexFieldsControl // IndexFieldsControl
class IndexFieldsControl : public ::svt::EditBrowseBox class IndexFieldsControl : public ::svt::EditBrowseBox
{ {
OModuleClient m_aModuleClient; OModuleClient m_aModuleClient;
protected: protected:
IndexFields m_aSavedValue; IndexFields m_aSavedValue;
...@@ -84,7 +86,7 @@ namespace dbaui ...@@ -84,7 +86,7 @@ namespace dbaui
bool isNewField() const { return GetCurRow() >= (sal_Int32)m_aFields.size(); } bool isNewField() const { return GetCurRow() >= (sal_Int32)m_aFields.size(); }
DECL_LINK( OnListEntrySelected, void* ); DECL_LINK_TYPED( OnListEntrySelected, DbaMouseDownListBoxController&, void );
private: private:
using ::svt::EditBrowseBox::Init; using ::svt::EditBrowseBox::Init;
......
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