diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 12:09:22 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 12:09:22 +0000 |
commit | fd13ab32c99ff0b02a2318c012b629d03bda8a4b (patch) | |
tree | 60bd16be3800b1476632a2e022b8f19989bd8bbf /formula/source/ui | |
parent | 06c151836fb0d06d7ca516ffa0f16657ec585f6e (diff) |
#i10000#: fix merge conflicts (CWS frmdlg)
Diffstat (limited to 'formula/source/ui')
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index e8198272f1..5990df37a4 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -96,6 +96,8 @@ private: DECL_LINK( SelectHdl, SvTreeListBox* ); + using Window::GetParent; + protected: IFormulaToken* GetFunctionEntry(SvLBoxEntry* pEntry); |