diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 11:01:13 +0000 |
| commit | dd6b88145580ed9b21e7adc8f2313b2aa512c9d0 (patch) | |
| tree | 1537c57a8b56b65d3ab38136fc85a4e3a0d75831 /sc/source/ui/inc | |
| parent | de131ce456dee71988b30bfd6ef67bf7f4badff1 (diff) | |
#i10000#: fix merge conflicts (CWS frmdlg)
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/inputhdl.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 068b6d46d..35e836163 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -69,7 +69,7 @@ private: TypedScStrCollection* pColumnData; TypedScStrCollection* pFormulaData; - TypedStrCollection* pFormulaDataPara; + TypedScStrCollection* pFormulaDataPara; ULONG nTipVisible; ULONG nTipVisibleSec; String aManualTip; |