diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-11-19 09:51:15 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-11-19 09:51:15 +0100 |
| commit | 8bf24a92b0e97a52412e4e12fb7223e36c1efcdf (patch) | |
| tree | 4efc960be1036db23b718fa5393ad9ea4672e68e /starmath/inc/dialog.hxx | |
| parent | 9a1374b54144b15cfef1a0d8eeba861a69fec875 (diff) | |
| parent | d1175e253f73b0f75c41cfe2c3ef8273a16c0d48 (diff) | |
cws tl84: merge with DEV300_m93
Diffstat (limited to 'starmath/inc/dialog.hxx')
| -rwxr-xr-x | starmath/inc/dialog.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index fae8b9aece41..818fec8009c9 100755 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -30,9 +30,7 @@ #include <vcl/image.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/image.hxx> #include <sfx2/tabdlg.hxx> #include <vcl/combobox.hxx> @@ -258,7 +256,7 @@ class SmDistanceDialog : public ModalDialog DECL_LINK(CheckBoxClickHdl, CheckBox *); using Window::SetHelpId; - void SetHelpId(MetricField &rField, ULONG nHelpId); + void SetHelpId(MetricField &rField, const rtl::OString& sHelpId); void SetCategory(USHORT Category); void ApplyImages(); @@ -404,8 +402,8 @@ public: { } - void SetChar(xub_Unicode aChar); - void SetFont(const Font &rFont); + void SetSymbol( const SmSym *pSym ); + void SetSymbol( sal_UCS4 cChar, const Font &rFont ); }; //////////////////////////////////////////////////////////////////////////////// |