INTEGRATION: CWS tl32 (1.17.68); FILE MERGED

2006/11/02 15:13:52 tl 1.17.68.1: #i69286# make starmath warning-free for unxsols4(.pro)

starmath/inc/dialog.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dialog.hxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: rt $ $Date: 2006-05-05 07:57:53 $
+ *  last change: $Author: vg $ $Date: 2007-05-25 12:08:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -318,6 +318,7 @@ class SmDistanceDialog : public ModalDialog
     DECL_LINK(DefaultButtonClickHdl, Button *);
     DECL_LINK(CheckBoxClickHdl, CheckBox *);
 
+    using   Window::SetHelpId;
     void    SetHelpId(MetricField &rField, ULONG nHelpId);
     void    SetCategory(USHORT Category);
 
@@ -547,6 +548,8 @@ public:
     SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymSetManager &rMgr, BOOL bFreeRes = TRUE);
     ~SmSymDefineDialog();
 
+    using OutputDevice::SetFont;
+
     // Dialog
     virtual short   Execute();