diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-03-08 09:23:53 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-08 13:42:32 +0000 |
| commit | 4e0c6a0ac78d3c68922e032eec7f9c05cc39023a (patch) | |
| tree | 625922e3f9afa276b0798ce0070d7db67cd4c295 /formula | |
| parent | 6df8417b98a74f58638b5fce7459c64f18ddedb4 (diff) | |
Resolves: fdo#58630 crash with refEdit button in SfxTabDialog
Change-Id: I11d6a0f1d4852aab1fe08671fd9c2a0dac0825a7
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/inc/formula/funcutl.hxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index 1dc10e88c062..b9e326786915 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -63,6 +63,8 @@ public: void SetRefDialog( IControlReferenceHandler* pDlg ); inline IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; } + Window* GetLabelWidgetForShrinkMode() { return m_pLabelWidget; } + void SetLabelWidgetForShrinkMode(Window *pLabel) { m_pLabelWidget = pLabel; } }; diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 4b047d31185c..64830d5d73e9 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -849,7 +849,8 @@ void EditBox::UpdateOldSel() RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ) : Edit( _pParent, rResId ), - pAnyRefDlg( pParent ) + pAnyRefDlg( pParent ), + m_pLabelWidget(NULL) { aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); aTimer.SetTimeout( SC_ENABLE_TIME ); @@ -857,7 +858,8 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI RefEdit::RefEdit( Window* _pParent, WinBits nStyle ) : Edit( _pParent, nStyle ), - pAnyRefDlg( NULL ) + pAnyRefDlg( NULL ), + m_pLabelWidget(NULL) { aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); aTimer.SetTimeout( SC_ENABLE_TIME ); |