Kaydet (Commit) 0ddd679d authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Ied0622e633be4696ebafed7ceec6fd0cacb8b9f2
üst 312330f6
...@@ -316,7 +316,7 @@ const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCrea ...@@ -316,7 +316,7 @@ const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCrea
if ( m_aFormsCreationHdl.IsSet() ) if ( m_aFormsCreationHdl.IsSet() )
{ {
m_aFormsCreationHdl.Call( this ); m_aFormsCreationHdl.Call( *this );
} }
FmFormModel* pFormsModel = PTR_CAST( FmFormModel, m_rPage.GetModel() ); FmFormModel* pFormsModel = PTR_CAST( FmFormModel, m_rPage.GetModel() );
......
...@@ -3609,7 +3609,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate ...@@ -3609,7 +3609,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate
// remove callbacks at the page // remove callbacks at the page
if ( pPage ) if ( pPage )
{ {
pPage->GetImpl().SetFormsCreationHdl( Link<>() ); pPage->GetImpl().SetFormsCreationHdl( Link<FmFormPageImpl&,void>() );
} }
UpdateForms( true ); UpdateForms( true );
} }
...@@ -3635,10 +3635,9 @@ IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void ) ...@@ -3635,10 +3635,9 @@ IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void )
} }
IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ ) IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFormsCreated, FmFormPageImpl&, void )
{ {
UpdateForms( true ); UpdateForms( true );
return 0L;
} }
......
...@@ -54,9 +54,9 @@ class SVX_DLLPRIVATE FmFormPageImpl ...@@ -54,9 +54,9 @@ class SVX_DLLPRIVATE FmFormPageImpl
::com::sun::star::uno::WeakReference< ::com::sun::star::container::XMap > m_aControlShapeMap; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XMap > m_aControlShapeMap;
FmFormPage& m_rPage; FmFormPage& m_rPage;
Link<> m_aFormsCreationHdl; Link<FmFormPageImpl&,void> m_aFormsCreationHdl;
bool m_bFirstActivation; bool m_bFirstActivation;
bool m_bAttemptedFormCreation; bool m_bAttemptedFormCreation;
public: public:
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true ); const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true );
void SetFormsCreationHdl( const Link<>& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; } void SetFormsCreationHdl( const Link<FmFormPageImpl&,void>& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; }
protected: protected:
/** finds a form with a given data source signature /** finds a form with a given data source signature
......
...@@ -105,6 +105,7 @@ protected: ...@@ -105,6 +105,7 @@ protected:
}; };
class FmFormPage; class FmFormPage;
class FmFormPageImpl;
struct FmLoadAction struct FmLoadAction
{ {
...@@ -468,7 +469,7 @@ private: ...@@ -468,7 +469,7 @@ private:
DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext*); DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext*);
DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void); DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void);
DECL_DLLPRIVATE_LINK_TYPED(OnFirstTimeActivation, void*, void); DECL_DLLPRIVATE_LINK_TYPED(OnFirstTimeActivation, void*, void);
DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPage*); DECL_DLLPRIVATE_LINK_TYPED(OnFormsCreated, FmFormPageImpl&, void);
SAL_DLLPRIVATE void LoopGrids(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE); SAL_DLLPRIVATE void LoopGrids(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE);
......
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