diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-03-04 12:22:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-04 16:07:48 +0000 |
| commit | 045e4115656063aa8d77e0581eaeea6cbf9e1c9e (patch) | |
| tree | a42a8cb60c119b87754ff2e12db964e7c00879e2 /sw/source/ui/inc | |
| parent | 5fff8a99b344d92e6eb715fb59e2819b645787e5 (diff) | |
Resolves: fdo#61665 modifying column width widgets crashes
Change-Id: Ifc9b31cad9e9935c4873c2785f203bd07d1f118e
Diffstat (limited to 'sw/source/ui/inc')
| -rw-r--r-- | sw/source/ui/inc/column.hxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 40a2603a034f..8cb80c152e01 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -134,6 +134,9 @@ class SwColumnPage : public SfxTabPage long nColDist[nMaxCols]; sal_uInt16 nMinWidth; PercentFieldWrap* pModifiedField; + + std::map<MetricField*, PercentFieldWrap*> m_aPercentFieldWrappersMap; + sal_Bool bFormat; sal_Bool bFrm; sal_Bool bHtmlMode; @@ -141,8 +144,8 @@ class SwColumnPage : public SfxTabPage // Handler DECL_LINK( ColModify, NumericField * ); - DECL_LINK( GapModify, PercentFieldWrap * ); - DECL_LINK( EdModify, PercentFieldWrap * ); + DECL_LINK( GapModify, MetricField * ); + DECL_LINK( EdModify, MetricField * ); DECL_LINK( AutoWidthHdl, CheckBox * ); DECL_LINK( SetDefaultsHdl, ValueSet * ); @@ -166,6 +169,8 @@ class SwColumnPage : public SfxTabPage SwColumnPage(Window *pParent, const SfxItemSet &rSet); + void connectPercentFieldWrapper(PercentFieldWrap &rWrap, const OString &rName); + public: virtual ~SwColumnPage(); |