sb131: merged in re/DEV300_next towards DEV300_m94

author: sb <sb@openoffice.org> 2010-11-19 11:35:41 +0100
committer: sb <sb@openoffice.org> 2010-11-19 11:35:41 +0100
commit: 78a69132580e37c31f62a1ee3caca6cd84f75aad (patch)
tree: 93bc1acb98412baf3116097deea545dc62a50ecd /starmath
parent: c659c9cd2c18a6ebd448080559cd404e9672691e (diff)
parent: f1dc19695c083ec5f1356a2c082f2c4feb53aa33 (diff)
15 files changed, 603 insertions, 462 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 7724bc975d54..a421cc8a164e 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -255,7 +255,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();
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
new file mode 100644
index 000000000000..f27b47edcdf3
--- /dev/null
+++ b/starmath/inc/helpids.h
@@ -0,0 +1,326 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef STARMATH_HELPIDS_H
+#define STARMATH_HELPIDS_H
+
+#define HID_SMA_OPTIONSDIALOG                             "STARMATH_HID_SMA_OPTIONSDIALOG"
+#define HID_SMA_FONTDIALOG                                "STARMATH_HID_SMA_FONTDIALOG"
+#define HID_SMA_FONTSIZEDIALOG                            "STARMATH_HID_SMA_FONTSIZEDIALOG"
+#define HID_SMA_FONTTYPEDIALOG                            "STARMATH_HID_SMA_FONTTYPEDIALOG"
+#define HID_SMA_DISTANCEDIALOG                            "STARMATH_HID_SMA_DISTANCEDIALOG"
+#define HID_SMA_ALIGNDIALOG                               "STARMATH_HID_SMA_ALIGNDIALOG"
+#define HID_SMA_PRINTOPTIONPAGE                           "STARMATH_HID_SMA_PRINTOPTIONPAGE"
+#define HID_SMA_SYMBOLDIALOG                              "STARMATH_HID_SMA_SYMBOLDIALOG"
+#define HID_SMA_SYMDEFINEDIALOG                           "STARMATH_HID_SMA_SYMDEFINEDIALOG"
+#define HID_SMA_EXTRAOPTIONPAGE                           "STARMATH_HID_SMA_EXTRAOPTIONPAGE"
+#define HID_SMA_DOCSAVEQUERY                              "STARMATH_HID_SMA_DOCSAVEQUERY"
+#define HID_SMA_OBJECTSAVEQUERY                           "STARMATH_HID_SMA_OBJECTSAVEQUERY"
+#define HID_SMA_DEFAULTSAVEQUERY                          "STARMATH_HID_SMA_DEFAULTSAVEQUERY"
+#define HID_SMA_ILLEGALOBJECTERROR                        "STARMATH_HID_SMA_ILLEGALOBJECTERROR"
+#define HID_SMA_ILLEGALFILEERROR                          "STARMATH_HID_SMA_ILLEGALFILEERROR"
+#define HID_SMA_WRITESYMBOLERROR                          "STARMATH_HID_SMA_WRITESYMBOLERROR"
+#define HID_SMA_READSYMBOLERROR                           "STARMATH_HID_SMA_READSYMBOLERROR"
+#define HID_SMA_NOMATHTYPEFACEWARNING                     "STARMATH_HID_SMA_NOMATHTYPEFACEWARNING"
+#define HID_SMA_OBJECTNAME                                "STARMATH_HID_SMA_OBJECTNAME"
+#define HID_SMA_VIEWNAME                                  "STARMATH_HID_SMA_VIEWNAME"
+#define HID_SMA_UNDOEDITNAME                              "STARMATH_HID_SMA_UNDOEDITNAME"
+#define HID_SMA_UNDOFORMATNAME                            "STARMATH_HID_SMA_UNDOFORMATNAME"
+#define HID_SMA_APPICO                                    "STARMATH_HID_SMA_APPICO"
+#define HID_SMA_DOCICO                                    "STARMATH_HID_SMA_DOCICO"
+#define HID_SMA_TMPICO                                    "STARMATH_HID_SMA_TMPICO"
+#define HID_SMA_COMMANDMENU                               "STARMATH_HID_SMA_COMMANDMENU"
+#define HID_SMA_VIEWMENU                                  "STARMATH_HID_SMA_VIEWMENU"
+#define HID_SMA_DISTANCEMENU                              "STARMATH_HID_SMA_DISTANCEMENU"
+#define HID_SMA_FONTMENU                                  "STARMATH_HID_SMA_FONTMENU"
+#define HID_SMA_STARTUPWINDOW                             "STARMATH_HID_SMA_STARTUPWINDOW"
+#define HID_SMA_TOOLBOXWINDOW                             "STARMATH_HID_SMA_TOOLBOXWINDOW"
+#define HID_SMA_CMDBOXWINDOW                              "STARMATH_HID_SMA_CMDBOXWINDOW"
+#define HID_SMA_UPDATEOBJECT                              "STARMATH_HID_SMA_UPDATEOBJECT"
+#define HID_SMA_FONTREGULAR                               "STARMATH_HID_SMA_FONTREGULAR"
+#define HID_SMA_FONTITALIC                                "STARMATH_HID_SMA_FONTITALIC"
+#define HID_SMA_FONTBOLD                                  "STARMATH_HID_SMA_FONTBOLD"
+#define HID_SMA_PRINTOPTION                               "STARMATH_HID_SMA_PRINTOPTION"
+#define HID_SMA_DOCUMENTSTR                               "STARMATH_HID_SMA_DOCUMENTSTR"
+#define HID_SMA_SYMBOLFILESSTR                            "STARMATH_HID_SMA_SYMBOLFILESSTR"
+#define HID_SMA_ALLFILESSTR                               "STARMATH_HID_SMA_ALLFILESSTR"
+#define HID_SMA_CREATORSTR                                "STARMATH_HID_SMA_CREATORSTR"
+#define HID_SMA_FILESMFTYP                                "STARMATH_HID_SMA_FILESMFTYP"
+#define HID_SMA_FILESYMTYP                                "STARMATH_HID_SMA_FILESYMTYP"
+#define HID_SMA_WIN_DOCUMENT                              "STARMATH_HID_SMA_WIN_DOCUMENT"
+#define HID_SMA_COMMAND_WIN_EDIT                          "STARMATH_HID_SMA_COMMAND_WIN_EDIT"
+
+#define HID_SMA_PLUSX                                     "STARMATH_HID_SMA_PLUSX"
+#define HID_SMA_MINUSX                                    "STARMATH_HID_SMA_MINUSX"
+#define HID_SMA_PLUSMINUSX                                "STARMATH_HID_SMA_PLUSMINUSX"
+#define HID_SMA_MINUSPLUSX                                "STARMATH_HID_SMA_MINUSPLUSX"
+#define HID_SMA_NEGX                                      "STARMATH_HID_SMA_NEGX"
+#define HID_SMA_XPLUSY                                    "STARMATH_HID_SMA_XPLUSY"
+#define HID_SMA_XMINUSY                                   "STARMATH_HID_SMA_XMINUSY"
+#define HID_SMA_XCDOTY                                    "STARMATH_HID_SMA_XCDOTY"
+#define HID_SMA_XTIMESY                                   "STARMATH_HID_SMA_XTIMESY"
+#define HID_SMA_XSYMTIMESY                                "STARMATH_HID_SMA_XSYMTIMESY"
+#define HID_SMA_XSYMDIVIDEY                               "STARMATH_HID_SMA_XSYMDIVIDEY"
+#define HID_SMA_XDIVY                                     "STARMATH_HID_SMA_XDIVY"
+#define HID_SMA_XOVERY                                    "STARMATH_HID_SMA_XOVERY"
+#define HID_SMA_XODIVIDEY                                 "STARMATH_HID_SMA_XODIVIDEY"
+#define HID_SMA_XODOTY                                    "STARMATH_HID_SMA_XODOTY"
+#define HID_SMA_XOMINUSY                                  "STARMATH_HID_SMA_XOMINUSY"
+#define HID_SMA_XOPLUSY                                   "STARMATH_HID_SMA_XOPLUSY"
+#define HID_SMA_XOTIMESY                                  "STARMATH_HID_SMA_XOTIMESY"
+#define HID_SMA_XANDY                                     "STARMATH_HID_SMA_XANDY"
+#define HID_SMA_XORY                                      "STARMATH_HID_SMA_XORY"
+#define HID_SMA_XEQY                                      "STARMATH_HID_SMA_XEQY"
+#define HID_SMA_XNEQY                                     "STARMATH_HID_SMA_XNEQY"
+#define HID_SMA_XLTY                                      "STARMATH_HID_SMA_XLTY"
+#define HID_SMA_XGTY                                      "STARMATH_HID_SMA_XGTY"
+#define HID_SMA_XLEY                                      "STARMATH_HID_SMA_XLEY"
+#define HID_SMA_XGEY                                      "STARMATH_HID_SMA_XGEY"
+#define HID_SMA_XLESLANTY                                 "STARMATH_HID_SMA_XLESLANTY"
+#define HID_SMA_XGESLANTY                                 "STARMATH_HID_SMA_XGESLANTY"
+#define HID_SMA_XLLY                                      "STARMATH_HID_SMA_XLLY"
+#define HID_SMA_XGGY                                      "STARMATH_HID_SMA_XGGY"
+#define HID_SMA_XDEFY                                     "STARMATH_HID_SMA_XDEFY"
+#define HID_SMA_XEQUIVY                                   "STARMATH_HID_SMA_XEQUIVY"
+#define HID_SMA_XAPPROXY                                  "STARMATH_HID_SMA_XAPPROXY"
+#define HID_SMA_XSIMY                                     "STARMATH_HID_SMA_XSIMY"
+#define HID_SMA_XSIMEQY                                   "STARMATH_HID_SMA_XSIMEQY"
+#define HID_SMA_XPROPY                                    "STARMATH_HID_SMA_XPROPY"
+#define HID_SMA_XORTHOY                                   "STARMATH_HID_SMA_XORTHOY"
+#define HID_SMA_XPARALLELY                                "STARMATH_HID_SMA_XPARALLELY"
+#define HID_SMA_XTOWARDY                                  "STARMATH_HID_SMA_XTOWARDY"
+#define HID_SMA_XTRANSLY                                  "STARMATH_HID_SMA_XTRANSLY"
+#define HID_SMA_XTRANSRY                                  "STARMATH_HID_SMA_XTRANSRY"
+#define HID_SMA_XINY                                      "STARMATH_HID_SMA_XINY"
+#define HID_SMA_XNOTINY                                   "STARMATH_HID_SMA_XNOTINY"
+#define HID_SMA_XOWNSY                                    "STARMATH_HID_SMA_XOWNSY"
+#define HID_SMA_XUNIONY                                   "STARMATH_HID_SMA_XUNIONY"
+#define HID_SMA_XINTERSECTIONY                            "STARMATH_HID_SMA_XINTERSECTIONY"
+#define HID_SMA_XSETMINUSY                                "STARMATH_HID_SMA_XSETMINUSY"
+#define HID_SMA_XSLASHY                                   "STARMATH_HID_SMA_XSLASHY"
+#define HID_SMA_XSUBSETY                                  "STARMATH_HID_SMA_XSUBSETY"
+#define HID_SMA_XSUBSETEQY                                "STARMATH_HID_SMA_XSUBSETEQY"
+#define HID_SMA_XSUPSETY                                  "STARMATH_HID_SMA_XSUPSETY"
+#define HID_SMA_XSUPSETEQY                                "STARMATH_HID_SMA_XSUPSETEQY"
+#define HID_SMA_XNSUBSETY                                 "STARMATH_HID_SMA_XNSUBSETY"
+#define HID_SMA_XNSUBSETEQY                               "STARMATH_HID_SMA_XNSUBSETEQY"
+#define HID_SMA_XNSUPSETY                                 "STARMATH_HID_SMA_XNSUPSETY"
+#define HID_SMA_XNSUPSETEQY                               "STARMATH_HID_SMA_XNSUPSETEQY"
+#define HID_SMA_ABSX                                      "STARMATH_HID_SMA_ABSX"
+#define HID_SMA_FACTX                                     "STARMATH_HID_SMA_FACTX"
+#define HID_SMA_SQRTX                                     "STARMATH_HID_SMA_SQRTX"
+#define HID_SMA_NROOTXY                                   "STARMATH_HID_SMA_NROOTXY"
+#define HID_SMA_EX                                        "STARMATH_HID_SMA_EX"
+#define HID_SMA_EXPX                                      "STARMATH_HID_SMA_EXPX"
+#define HID_SMA_LNX                                       "STARMATH_HID_SMA_LNX"
+#define HID_SMA_LOGX                                      "STARMATH_HID_SMA_LOGX"
+#define HID_SMA_SINX                                      "STARMATH_HID_SMA_SINX"
+#define HID_SMA_COSX                                      "STARMATH_HID_SMA_COSX"
+#define HID_SMA_TANX                                      "STARMATH_HID_SMA_TANX"
+#define HID_SMA_COTX                                      "STARMATH_HID_SMA_COTX"
+#define HID_SMA_ARCSINX                                   "STARMATH_HID_SMA_ARCSINX"
+#define HID_SMA_ARCCOSX                                   "STARMATH_HID_SMA_ARCCOSX"
+#define HID_SMA_ARCTANX                                   "STARMATH_HID_SMA_ARCTANX"
+#define HID_SMA_ARCCOTX                                   "STARMATH_HID_SMA_ARCCOTX"
+#define HID_SMA_SINHX                                     "STARMATH_HID_SMA_SINHX"
+#define HID_SMA_COSHX                                     "STARMATH_HID_SMA_COSHX"
+#define HID_SMA_TANHX                                     "STARMATH_HID_SMA_TANHX"
+#define HID_SMA_COTHX                                     "STARMATH_HID_SMA_COTHX"
+#define HID_SMA_ARSINHX                                   "STARMATH_HID_SMA_ARSINHX"
+#define HID_SMA_ARCOSHX                                   "STARMATH_HID_SMA_ARCOSHX"
+#define HID_SMA_ARTANHX                                   "STARMATH_HID_SMA_ARTANHX"
+#define HID_SMA_ARCOTHX                                   "STARMATH_HID_SMA_ARCOTHX"
+#define HID_SMA_SUMX                                      "STARMATH_HID_SMA_SUMX"
+#define HID_SMA_PRODX                                     "STARMATH_HID_SMA_PRODX"
+#define HID_SMA_COPRODX                                   "STARMATH_HID_SMA_COPRODX"
+#define HID_SMA_LIMX                                      "STARMATH_HID_SMA_LIMX"
+#define HID_SMA_LIMINFX                                   "STARMATH_HID_SMA_LIMINFX"
+#define HID_SMA_LIMSUPX                                   "STARMATH_HID_SMA_LIMSUPX"
+#define HID_SMA_EXISTS                                    "STARMATH_HID_SMA_EXISTS"
+#define HID_SMA_FORALL                                    "STARMATH_HID_SMA_FORALL"
+#define HID_SMA_NABLA                                     "STARMATH_HID_SMA_NABLA"
+#define HID_SMA_INTX                                      "STARMATH_HID_SMA_INTX"
+#define HID_SMA_IINTX                                     "STARMATH_HID_SMA_IINTX"
+#define HID_SMA_IIINTX                                    "STARMATH_HID_SMA_IIINTX"
+#define HID_SMA_LINTX                                     "STARMATH_HID_SMA_LINTX"
+#define HID_SMA_LLINTX                                    "STARMATH_HID_SMA_LLINTX"
+#define HID_SMA_LLLINTX                                   "STARMATH_HID_SMA_LLLINTX"
+#define HID_SMA_FROMX                                     "STARMATH_HID_SMA_FROMX"
+#define HID_SMA_TOX                                       "STARMATH_HID_SMA_TOX"
+#define HID_SMA_FROMXTOY                                  "STARMATH_HID_SMA_FROMXTOY"
+#define HID_SMA_XCIRCY                                    "STARMATH_HID_SMA_XCIRCY"
+#define HID_SMA_XDIVIDESY                                 "STARMATH_HID_SMA_XDIVIDESY"
+#define HID_SMA_XNDIVIDESY                                "STARMATH_HID_SMA_XNDIVIDESY"
+#define HID_SMA_DLARROW                                   "STARMATH_HID_SMA_DLARROW"
+#define HID_SMA_DLRARROW                                  "STARMATH_HID_SMA_DLRARROW"
+#define HID_SMA_DRARROW                                   "STARMATH_HID_SMA_DRARROW"
+
+#define HID_SMA_MISC_CAT                                  "STARMATH_HID_SMA_MISC_CAT"
+#define HID_SMA_UNBINOPS_CAT                              "STARMATH_HID_SMA_UNBINOPS_CAT"
+#define HID_SMA_RELATIONS_CAT                             "STARMATH_HID_SMA_RELATIONS_CAT"
+#define HID_SMA_SETOPERATIONS_CAT                         "STARMATH_HID_SMA_SETOPERATIONS_CAT"
+#define HID_SMA_FUNCTIONS_CAT                             "STARMATH_HID_SMA_FUNCTIONS_CAT"
+#define HID_SMA_OPERATORS_CAT                             "STARMATH_HID_SMA_OPERATORS_CAT"
+#define HID_SMA_ATTRIBUTES_CAT                            "STARMATH_HID_SMA_ATTRIBUTES_CAT"
+#define HID_SMA_BRACKETS_CAT                              "STARMATH_HID_SMA_BRACKETS_CAT"
+#define HID_SMA_FORMAT_CAT                                "STARMATH_HID_SMA_FORMAT_CAT"
+
+#define HID_SMA_OPERATOR_WIN                              "STARMATH_HID_SMA_OPERATOR_WIN"
+#define HID_SMA_UNBINOPS_TBX                              "STARMATH_HID_SMA_UNBINOPS_TBX"
+#define HID_SMA_RELATIONS_TBX                             "STARMATH_HID_SMA_RELATIONS_TBX"
+#define HID_SMA_SETOPERATIONS_TBX                         "STARMATH_HID_SMA_SETOPERATIONS_TBX"
+#define HID_SMA_FUNCTIONS_TBX                             "STARMATH_HID_SMA_FUNCTIONS_TBX"
+#define HID_SMA_OPERATORS_TBX                             "STARMATH_HID_SMA_OPERATORS_TBX"
+#define HID_SMA_ATTRIBUTES_TBX                            "STARMATH_HID_SMA_ATTRIBUTES_TBX"
+#define HID_SMA_BRACKETS_TBX                              "STARMATH_HID_SMA_BRACKETS_TBX"
+#define HID_SMA_FORMAT_TBX                                "STARMATH_HID_SMA_FORMAT_TBX"
+#define HID_SMA_SELECTION_TBX                             "STARMATH_HID_SMA_SELECTION_TBX"
+#define HID_SMA_COMMAND_WIN                               "STARMATH_HID_SMA_COMMAND_WIN"
+#define HID_SMA_MISC_MENU                                 "STARMATH_HID_SMA_MISC_MENU"
+#define HID_SMA_FUNCTIONSOTHER1_MENU                      "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU"
+
+#define HID_SMA_ACUTEX                                    "STARMATH_HID_SMA_ACUTEX"
+#define HID_SMA_BARX                                      "STARMATH_HID_SMA_BARX"
+#define HID_SMA_BREVEX                                    "STARMATH_HID_SMA_BREVEX"
+#define HID_SMA_CHECKX                                    "STARMATH_HID_SMA_CHECKX"
+#define HID_SMA_CIRCLEX                                   "STARMATH_HID_SMA_CIRCLEX"
+#define HID_SMA_DOTX                                      "STARMATH_HID_SMA_DOTX"
+#define HID_SMA_DDOTX                                     "STARMATH_HID_SMA_DDOTX"
+#define HID_SMA_DDDOTX                                    "STARMATH_HID_SMA_DDDOTX"
+#define HID_SMA_GRAVEX                                    "STARMATH_HID_SMA_GRAVEX"
+#define HID_SMA_HATX                                      "STARMATH_HID_SMA_HATX"
+#define HID_SMA_TILDEX                                    "STARMATH_HID_SMA_TILDEX"
+#define HID_SMA_VECX                                      "STARMATH_HID_SMA_VECX"
+#define HID_SMA_UNDERLINEX                                "STARMATH_HID_SMA_UNDERLINEX"
+#define HID_SMA_OVERLINEX                                 "STARMATH_HID_SMA_OVERLINEX"
+#define HID_SMA_OVERSTRIKEX                               "STARMATH_HID_SMA_OVERSTRIKEX"
+#define HID_SMA_PHANTOMX                                  "STARMATH_HID_SMA_PHANTOMX"
+#define HID_SMA_BOLDX                                     "STARMATH_HID_SMA_BOLDX"
+#define HID_SMA_ITALX                                     "STARMATH_HID_SMA_ITALX"
+#define HID_SMA_SIZEXY                                    "STARMATH_HID_SMA_SIZEXY"
+#define HID_SMA_FONTXY                                    "STARMATH_HID_SMA_FONTXY"
+#define HID_SMA_COLORX                                    "STARMATH_HID_SMA_COLORX"
+#define HID_SMA_LRGROUPX                                  "STARMATH_HID_SMA_LRGROUPX"
+#define HID_SMA_LRPARENTX                                 "STARMATH_HID_SMA_LRPARENTX"
+#define HID_SMA_LRBRACKETX                                "STARMATH_HID_SMA_LRBRACKETX"
+#define HID_SMA_LRBRACEX                                  "STARMATH_HID_SMA_LRBRACEX"
+#define HID_SMA_LRANGLEX                                  "STARMATH_HID_SMA_LRANGLEX"
+#define HID_SMA_LRCEILX                                   "STARMATH_HID_SMA_LRCEILX"
+#define HID_SMA_LRFLOORX                                  "STARMATH_HID_SMA_LRFLOORX"
+#define HID_SMA_LRLINEX                                   "STARMATH_HID_SMA_LRLINEX"
+#define HID_SMA_LRDLINEX                                  "STARMATH_HID_SMA_LRDLINEX"
+#define HID_SMA_SLRPARENTX                                "STARMATH_HID_SMA_SLRPARENTX"
+#define HID_SMA_SLRBRACKETX                               "STARMATH_HID_SMA_SLRBRACKETX"
+#define HID_SMA_SLRBRACEX                                 "STARMATH_HID_SMA_SLRBRACEX"
+#define HID_SMA_SLRANGLEX                                 "STARMATH_HID_SMA_SLRANGLEX"
+#define HID_SMA_SLRCEILX                                  "STARMATH_HID_SMA_SLRCEILX"
+#define HID_SMA_SLRFLOORX                                 "STARMATH_HID_SMA_SLRFLOORX"
+#define HID_SMA_SLRLINEX                                  "STARMATH_HID_SMA_SLRLINEX"
+#define HID_SMA_SLRDLINEX                                 "STARMATH_HID_SMA_SLRDLINEX"
+#define HID_SMA_RSUBX                                     "STARMATH_HID_SMA_RSUBX"
+#define HID_SMA_RSUPX                                     "STARMATH_HID_SMA_RSUPX"
+#define HID_SMA_LSUBX                                     "STARMATH_HID_SMA_LSUBX"
+#define HID_SMA_LSUPX                                     "STARMATH_HID_SMA_LSUPX"
+#define HID_SMA_SBLANK                                    "STARMATH_HID_SMA_SBLANK"
+#define HID_SMA_BLANK                                     "STARMATH_HID_SMA_BLANK"
+#define HID_SMA_NEWLINE                                   "STARMATH_HID_SMA_NEWLINE"
+#define HID_SMA_BINOMXY                                   "STARMATH_HID_SMA_BINOMXY"
+#define HID_SMA_STACK                                     "STARMATH_HID_SMA_STACK"
+#define HID_SMA_MATRIX                                    "STARMATH_HID_SMA_MATRIX"
+#define HID_SMA_ALIGNLX                                   "STARMATH_HID_SMA_ALIGNLX"
+#define HID_SMA_ALIGNCX                                   "STARMATH_HID_SMA_ALIGNCX"
+#define HID_SMA_ALIGNRX                                   "STARMATH_HID_SMA_ALIGNRX"
+#define HID_SMA_ALEPH                                     "STARMATH_HID_SMA_ALEPH"
+#define HID_SMA_EMPTYSET                                  "STARMATH_HID_SMA_EMPTYSET"
+#define HID_SMA_RE                                        "STARMATH_HID_SMA_RE"
+#define HID_SMA_IM                                        "STARMATH_HID_SMA_IM"
+#define HID_SMA_INFINITY                                  "STARMATH_HID_SMA_INFINITY"
+#define HID_SMA_PARTIAL                                   "STARMATH_HID_SMA_PARTIAL"
+#define HID_SMA_WP                                        "STARMATH_HID_SMA_WP"
+#define HID_SMA_DOTSAXIS                                  "STARMATH_HID_SMA_DOTSAXIS"
+#define HID_SMA_DOTSUP                                    "STARMATH_HID_SMA_DOTSUP"
+#define HID_SMA_DOTSDOWN                                  "STARMATH_HID_SMA_DOTSDOWN"
+#define HID_SMA_DOTSLOW                                   "STARMATH_HID_SMA_DOTSLOW"
+#define HID_SMA_DOTSVERT                                  "STARMATH_HID_SMA_DOTSVERT"
+
+#define HID_SMA_SETN                                      "STARMATH_HID_SMA_SETN"
+#define HID_SMA_SETZ                                      "STARMATH_HID_SMA_SETZ"
+#define HID_SMA_SETQ                                      "STARMATH_HID_SMA_SETQ"
+#define HID_SMA_SETR                                      "STARMATH_HID_SMA_SETR"
+#define HID_SMA_SETC                                      "STARMATH_HID_SMA_SETC"
+#define HID_SMA_WIDEHATX                                  "STARMATH_HID_SMA_WIDEHATX"
+#define HID_SMA_WIDETILDEX                                "STARMATH_HID_SMA_WIDETILDEX"
+#define HID_SMA_WIDEVECX                                  "STARMATH_HID_SMA_WIDEVECX"
+#define HID_SMA_CSUBX                                     "STARMATH_HID_SMA_CSUBX"
+#define HID_SMA_CSUPX                                     "STARMATH_HID_SMA_CSUPX"
+#define HID_SMA_HBAR                                      "STARMATH_HID_SMA_HBAR"
+#define HID_SMA_LAMBDABAR                                 "STARMATH_HID_SMA_LAMBDABAR"
+#define HID_SMA_LEFTARROW                                 "STARMATH_HID_SMA_LEFTARROW"
+#define HID_SMA_RIGHTARROW                                "STARMATH_HID_SMA_RIGHTARROW"
+#define HID_SMA_UPARROW                                   "STARMATH_HID_SMA_UPARROW"
+#define HID_SMA_DOWNARROW                                 "STARMATH_HID_SMA_DOWNARROW"
+
+#define HID_SMA_DEFAULT_DIST                              "STARMATH_HID_SMA_DEFAULT_DIST"
+#define HID_SMA_LINE_DIST                                 "STARMATH_HID_SMA_LINE_DIST"
+#define HID_SMA_ROOT_DIST                                 "STARMATH_HID_SMA_ROOT_DIST"
+#define HID_SMA_SUP_DIST                                  "STARMATH_HID_SMA_SUP_DIST"
+#define HID_SMA_SUB_DIST                                  "STARMATH_HID_SMA_SUB_DIST"
+#define HID_SMA_NUMERATOR_DIST                            "STARMATH_HID_SMA_NUMERATOR_DIST"
+#define HID_SMA_DENOMINATOR_DIST                          "STARMATH_HID_SMA_DENOMINATOR_DIST"
+#define HID_SMA_FRACLINE_EXCWIDTH                         "STARMATH_HID_SMA_FRACLINE_EXCWIDTH"
+#define HID_SMA_FRACLINE_LINEWIDTH                        "STARMATH_HID_SMA_FRACLINE_LINEWIDTH"
+#define HID_SMA_UPPERLIMIT_DIST                           "STARMATH_HID_SMA_UPPERLIMIT_DIST"
+#define HID_SMA_LOWERLIMIT_DIST                           "STARMATH_HID_SMA_LOWERLIMIT_DIST"
+#define HID_SMA_BRACKET_EXCHEIGHT                         "STARMATH_HID_SMA_BRACKET_EXCHEIGHT"
+#define HID_SMA_BRACKET_DIST                              "STARMATH_HID_SMA_BRACKET_DIST"
+#define HID_SMA_MATRIXROW_DIST                            "STARMATH_HID_SMA_MATRIXROW_DIST"
+#define HID_SMA_MATRIXCOL_DIST                            "STARMATH_HID_SMA_MATRIXCOL_DIST"
+#define HID_SMA_ATTRIBUT_DIST                             "STARMATH_HID_SMA_ATTRIBUT_DIST"
+#define HID_SMA_INTERATTRIBUT_DIST                        "STARMATH_HID_SMA_INTERATTRIBUT_DIST"
+#define HID_SMA_OPERATOR_EXCHEIGHT                        "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT"
+#define HID_SMA_OPERATOR_DIST                             "STARMATH_HID_SMA_OPERATOR_DIST"
+#define HID_SMA_LEFTBORDER_DIST                           "STARMATH_HID_SMA_LEFTBORDER_DIST"
+#define HID_SMA_RIGHTBORDER_DIST                          "STARMATH_HID_SMA_RIGHTBORDER_DIST"
+#define HID_SMA_UPPERBORDER_DIST                          "STARMATH_HID_SMA_UPPERBORDER_DIST"
+#define HID_SMA_LOWERBORDER_DIST                          "STARMATH_HID_SMA_LOWERBORDER_DIST"
+#define HID_SMA_SCALE_ALL_BRACKETS                        "STARMATH_HID_SMA_SCALE_ALL_BRACKETS"
+#define HID_SMA_BRACKET_EXCHEIGHT2                        "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2"
+#define HID_SMA_LMRANGLEXY                                "STARMATH_HID_SMA_LMRANGLEXY"
+#define HID_SMA_SLMRANGLEXY                               "STARMATH_HID_SMA_SLMRANGLEXY"
+#define HID_SMA_XWIDESLASHY                               "STARMATH_HID_SMA_XWIDESLASHY"
+#define HID_SMA_XWIDEBSLASHY                              "STARMATH_HID_SMA_XWIDEBSLASHY"
+#define HID_SMA_XOVERBRACEY                               "STARMATH_HID_SMA_XOVERBRACEY"
+#define HID_SMA_XUNDERBRACEY                              "STARMATH_HID_SMA_XUNDERBRACEY"
+#define HID_SMA_LRDBRACKETX                               "STARMATH_HID_SMA_LRDBRACKETX"
+#define HID_SMA_SLRDBRACKETX                              "STARMATH_HID_SMA_SLRDBRACKETX"
+
+#define HID_SMA_CONTROL_SYMBOLSET_VIEW                    "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW"
+#define HID_SMA_CONTROL_FONTCHAR_VIEW                     "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW"
+
+#define HID_SMA_NOSPACE                                   "STARMATH_HID_SMA_NOSPACE"
+
+#endif
+
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 92c9d4621292..e2a21238064d 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -180,6 +180,10 @@ public:
 
     const SmNode *  FindTokenAt(USHORT nRow, USHORT nCol) const;
     const SmNode *  FindRectClosestTo(const Point &rPoint) const;
+
+    // --> 4.7.2010 #i972#
+    virtual long GetFormulaBaseline() const;
+    // <--
 };
 
 
@@ -456,6 +460,9 @@ public:
 
 class SmTableNode : public SmStructureNode
 {
+    // --> 4.7.2010 #i972#
+    long nFormulaBaseline;
+    // <--
 public:
     SmTableNode(const SmToken &rNodeToken)
     :   SmStructureNode(NTABLE, rNodeToken)
@@ -465,6 +472,7 @@ public:
     virtual SmNode * GetLeftMost();
 
     virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+    virtual long GetFormulaBaseline() const;
 };
 
 
diff --git a/starmath/inc/smcommands.h b/starmath/inc/smcommands.h
new file mode 100644
index 000000000000..d2f08c55f4c4
--- /dev/null
+++ b/starmath/inc/smcommands.h
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SM_SNCOMMANDS_HRC
+#define SM_SMCOMMANDS_HRC
+
+#define CMD_SID_ADJUST                              ".uno:Adjust"
+#define CMD_SID_ALIGN                               ".uno:ChangeAlignment"
+#define CMD_SID_DISTANCE                            ".uno:ChangeDistance"
+#define CMD_SID_FONT                                ".uno:ChangeFont"
+#define CMD_SID_FONTSIZE                            ".uno:ChangeFontSize"
+#define CMD_SID_CMDBOXWINDOW                        ".uno:CommandWindow"
+#define CMD_SID_PREFERENCES                         ".uno:Preferences"
+#define CMD_SID_TEXT                                ".uno:ConfigName"
+#define CMD_SID_COPYOBJECT                          ".uno:CopyObject"
+#define CMD_SID_DRAW                                ".uno:Draw"
+#define CMD_SID_FITINWINDOW                         ".uno:FitInWindow"
+#define CMD_SID_FORMULACURSOR                       ".uno:FormelCursor"
+#define CMD_SID_GAPHIC_SM                           ".uno:Graphic"
+#define CMD_SID_INSERTCOMMAND                       ".uno:InsertCommand"
+#define CMD_SID_INSERTTEXT                          ".uno:InsertConfigName"
+#define CMD_SID_INSERT_FORMULA                      ".uno:InsertFormula"
+#define CMD_SID_LOADSYMBOLS                         ".uno:LoadSymbols"
+#define CMD_SID_MODIFYSTATUS                        ".uno:ModifyStatus"
+#define CMD_SID_NEXTERR                             ".uno:NextError"
+#define CMD_SID_NEXTMARK                            ".uno:NextMark"
+#define CMD_SID_PASTEOBJECT                         ".uno:PasteObject"
+#define CMD_SID_PREVERR                             ".uno:PrevError"
+#define CMD_SID_PREVMARK                            ".uno:PrevMark"
+#define CMD_SID_AUTO_REDRAW                         ".uno:RedrawAutomatic"
+#define CMD_SID_SAVESYMBOLS                         ".uno:SaveSymbols"
+#define CMD_SID_GETEDITTEXT                         ".uno:SetPaperSize"
+#define CMD_SID_SYMBOLS_CATALOGUE                   ".uno:SymbolCatalogue"
+#define CMD_SID_SYMBOLS                             ".uno:Symbols"
+#define CMD_SID_TEXTMODE                            ".uno:Textmode"
+#define CMD_SID_TEXTSTATUS                          ".uno:TextStatus"
+#define CMD_SID_TOOLBOXWINDOW                       ".uno:ToolBowWindow"
+#define CMD_SID_TOOLBOX                             ".uno:ToolBox"
+#define CMD_SID_VIEW100                             ".uno:View100"
+#define CMD_SID_VIEW200                             ".uno:View200"
+#define CMD_SID_VIEW050                             ".uno:View50"
+#define CMD_SID_ZOOMIN                              ".uno:ZoomIn"
+#define CMD_SID_ZOOMOUT                             ".uno:ZoomOut"
+
+#endif
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index f74beb9de92b..4de625e449e1 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -131,7 +131,6 @@ class SmModule : public SfxModule, utl::ConfigurationListener
     SvtSysLocale            *pSysLocale;
     VirtualDevice           *pVirtualDev;
 
-    virtual void FillStatusBar(StatusBar &rBar);
     void _CreateSysLocale() const;
     void _CreateVirtualDev() const;
 
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 1b076fb7bf31..1b919471115c 100755..100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -30,6 +30,7 @@
 #include <svl/solar.hrc>
 #include <sfx2/sfxsids.hrc>
 #include <editeng/memberids.hrc>
+#include "helpids.h"
 
 #define SID_NEXTERR                 (SID_SMA_START + 1)
 #define SID_PREVERR                 (SID_SMA_START + 2)
@@ -457,300 +458,6 @@
 
 #define MN_SUB_SENDTO                   (RID_APP_START + 3120)
 
-#define HID_SMA_OPTIONSDIALOG           (HID_SMA_START + 1)
-#define HID_SMA_FONTDIALOG              (HID_SMA_START + 2)
-#define HID_SMA_FONTSIZEDIALOG          (HID_SMA_START + 3)
-#define HID_SMA_FONTTYPEDIALOG          (HID_SMA_START + 4)
-#define HID_SMA_DISTANCEDIALOG          (HID_SMA_START + 5)
-#define HID_SMA_ALIGNDIALOG             (HID_SMA_START + 6)
-#define HID_SMA_PRINTOPTIONPAGE         (HID_SMA_START + 7)
-#define HID_SMA_SYMBOLDIALOG            (HID_SMA_START + 8)
-#define HID_SMA_SYMDEFINEDIALOG         (HID_SMA_START + 9)
-#define HID_SMA_EXTRAOPTIONPAGE         (HID_SMA_START + 10)
-#define HID_SMA_DOCSAVEQUERY            (HID_SMA_START + 11)
-#define HID_SMA_OBJECTSAVEQUERY         (HID_SMA_START + 12)
-#define HID_SMA_DEFAULTSAVEQUERY        (HID_SMA_START + 13)
-#define HID_SMA_ILLEGALOBJECTERROR      (HID_SMA_START + 14)
-#define HID_SMA_ILLEGALFILEERROR        (HID_SMA_START + 15)
-#define HID_SMA_WRITESYMBOLERROR        (HID_SMA_START + 16)
-#define HID_SMA_READSYMBOLERROR         (HID_SMA_START + 17)
-#define HID_SMA_NOMATHTYPEFACEWARNING   (HID_SMA_START + 18)
-#define HID_SMA_OBJECTNAME              (HID_SMA_START + 19)
-#define HID_SMA_VIEWNAME                (HID_SMA_START + 20)
-#define HID_SMA_UNDOEDITNAME            (HID_SMA_START + 21)
-#define HID_SMA_UNDOFORMATNAME          (HID_SMA_START + 22)
-#define HID_SMA_APPICO                  (HID_SMA_START + 23)
-#define HID_SMA_DOCICO                  (HID_SMA_START + 24)
-#define HID_SMA_TMPICO                  (HID_SMA_START + 25)
-#define HID_SMA_COMMANDMENU             (HID_SMA_START + 26)
-#define HID_SMA_VIEWMENU                (HID_SMA_START + 27)
-#define HID_SMA_DISTANCEMENU            (HID_SMA_START + 28)
-#define HID_SMA_FONTMENU                (HID_SMA_START + 29)
-#define HID_SMA_STARTUPWINDOW           (HID_SMA_START + 30)
-#define HID_SMA_TOOLBOXWINDOW           (HID_SMA_START + 31)
-#define HID_SMA_CMDBOXWINDOW            (HID_SMA_START + 32)
-#define HID_SMA_UPDATEOBJECT            (HID_SMA_START + 33)
-#define HID_SMA_FONTREGULAR             (HID_SMA_START + 34)
-#define HID_SMA_FONTITALIC              (HID_SMA_START + 35)
-#define HID_SMA_FONTBOLD                (HID_SMA_START + 36)
-#define HID_SMA_PRINTOPTION             (HID_SMA_START + 37)
-#define HID_SMA_DOCUMENTSTR             (HID_SMA_START + 38)
-#define HID_SMA_SYMBOLFILESSTR          (HID_SMA_START + 39)
-#define HID_SMA_ALLFILESSTR             (HID_SMA_START + 40)
-#define HID_SMA_CREATORSTR              (HID_SMA_START + 41)
-#define HID_SMA_FILESMFTYP              (HID_SMA_START + 42)
-#define HID_SMA_FILESYMTYP              (HID_SMA_START + 43)
-#define HID_SMA_WIN_DOCUMENT            (HID_SMA_START + 44)
-#define HID_SMA_COMMAND_WIN_EDIT        (HID_SMA_START + 45)
-
-#define HID_SMA_PLUSX               (HID_SMA_START + 50)
-#define HID_SMA_MINUSX              (HID_SMA_START + 51)
-#define HID_SMA_PLUSMINUSX          (HID_SMA_START + 52)
-#define HID_SMA_MINUSPLUSX          (HID_SMA_START + 53)
-#define HID_SMA_NEGX                (HID_SMA_START + 54)
-#define HID_SMA_XPLUSY              (HID_SMA_START + 55)
-#define HID_SMA_XMINUSY             (HID_SMA_START + 56)
-#define HID_SMA_XCDOTY              (HID_SMA_START + 57)
-#define HID_SMA_XTIMESY             (HID_SMA_START + 58)
-#define HID_SMA_XSYMTIMESY          (HID_SMA_START + 59)
-#define HID_SMA_XSYMDIVIDEY         (HID_SMA_START + 60)
-#define HID_SMA_XDIVY               (HID_SMA_START + 61)
-#define HID_SMA_XOVERY              (HID_SMA_START + 62)
-#define HID_SMA_XODIVIDEY           (HID_SMA_START + 63)
-#define HID_SMA_XODOTY              (HID_SMA_START + 64)
-#define HID_SMA_XOMINUSY            (HID_SMA_START + 65)
-#define HID_SMA_XOPLUSY             (HID_SMA_START + 66)
-#define HID_SMA_XOTIMESY            (HID_SMA_START + 67)
-#define HID_SMA_XANDY               (HID_SMA_START + 68)
-#define HID_SMA_XORY                (HID_SMA_START + 69)
-#define HID_SMA_XEQY                (HID_SMA_START + 70)
-#define HID_SMA_XNEQY               (HID_SMA_START + 71)
-#define HID_SMA_XLTY                (HID_SMA_START + 72)
-#define HID_SMA_XGTY                (HID_SMA_START + 73)
-#define HID_SMA_XLEY                (HID_SMA_START + 74)
-#define HID_SMA_XGEY                (HID_SMA_START + 75)
-#define HID_SMA_XLESLANTY           (HID_SMA_START + 76)
-#define HID_SMA_XGESLANTY           (HID_SMA_START + 77)
-#define HID_SMA_XLLY                (HID_SMA_START + 78)
-#define HID_SMA_XGGY                (HID_SMA_START + 79)
-#define HID_SMA_XDEFY               (HID_SMA_START + 80)
-#define HID_SMA_XEQUIVY             (HID_SMA_START + 81)
-#define HID_SMA_XAPPROXY            (HID_SMA_START + 82)
-#define HID_SMA_XSIMY               (HID_SMA_START + 83)
-#define HID_SMA_XSIMEQY             (HID_SMA_START + 84)
-#define HID_SMA_XPROPY              (HID_SMA_START + 85)
-#define HID_SMA_XORTHOY             (HID_SMA_START + 86)
-#define HID_SMA_XPARALLELY          (HID_SMA_START + 87)
-#define HID_SMA_XTOWARDY            (HID_SMA_START + 88)
-#define HID_SMA_XTRANSLY            (HID_SMA_START + 89)
-#define HID_SMA_XTRANSRY            (HID_SMA_START + 90)
-#define HID_SMA_XINY                (HID_SMA_START + 91)
-#define HID_SMA_XNOTINY             (HID_SMA_START + 92)
-#define HID_SMA_XOWNSY              (HID_SMA_START + 93)
-#define HID_SMA_XUNIONY             (HID_SMA_START + 94)
-#define HID_SMA_XINTERSECTIONY      (HID_SMA_START + 95)
-#define HID_SMA_XSETMINUSY          (HID_SMA_START + 96)
-#define HID_SMA_XSLASHY             (HID_SMA_START + 97)
-#define HID_SMA_XSUBSETY            (HID_SMA_START + 98)
-#define HID_SMA_XSUBSETEQY          (HID_SMA_START + 99)
-#define HID_SMA_XSUPSETY            (HID_SMA_START + 100)
-#define HID_SMA_XSUPSETEQY          (HID_SMA_START + 101)
-#define HID_SMA_XNSUBSETY           (HID_SMA_START + 102)
-#define HID_SMA_XNSUBSETEQY         (HID_SMA_START + 103)
-#define HID_SMA_XNSUPSETY           (HID_SMA_START + 104)
-#define HID_SMA_XNSUPSETEQY         (HID_SMA_START + 105)
-#define HID_SMA_ABSX                (HID_SMA_START + 106)
-#define HID_SMA_FACTX               (HID_SMA_START + 107)
-#define HID_SMA_SQRTX               (HID_SMA_START + 108)
-#define HID_SMA_NROOTXY             (HID_SMA_START + 109)
-#define HID_SMA_EX                  (HID_SMA_START + 110)
-#define HID_SMA_EXPX                (HID_SMA_START + 111)
-#define HID_SMA_LNX                 (HID_SMA_START + 112)
-#define HID_SMA_LOGX                (HID_SMA_START + 113)
-#define HID_SMA_SINX                (HID_SMA_START + 114)
-#define HID_SMA_COSX                (HID_SMA_START + 115)
-#define HID_SMA_TANX                (HID_SMA_START + 116)
-#define HID_SMA_COTX                (HID_SMA_START + 117)
-#define HID_SMA_ARCSINX             (HID_SMA_START + 118)
-#define HID_SMA_ARCCOSX             (HID_SMA_START + 119)
-#define HID_SMA_ARCTANX             (HID_SMA_START + 120)
-#define HID_SMA_ARCCOTX             (HID_SMA_START + 121)
-#define HID_SMA_SINHX               (HID_SMA_START + 122)
-#define HID_SMA_COSHX               (HID_SMA_START + 123)
-#define HID_SMA_TANHX               (HID_SMA_START + 124)
-#define HID_SMA_COTHX               (HID_SMA_START + 125)
-#define HID_SMA_ARSINHX             (HID_SMA_START + 126)
-#define HID_SMA_ARCOSHX             (HID_SMA_START + 127)
-#define HID_SMA_ARTANHX             (HID_SMA_START + 128)
-#define HID_SMA_ARCOTHX             (HID_SMA_START + 129)
-#define HID_SMA_SUMX                (HID_SMA_START + 130)
-#define HID_SMA_PRODX               (HID_SMA_START + 131)
-#define HID_SMA_COPRODX             (HID_SMA_START + 132)
-#define HID_SMA_LIMX                (HID_SMA_START + 133)
-#define HID_SMA_LIMINFX             (HID_SMA_START + 134)
-#define HID_SMA_LIMSUPX             (HID_SMA_START + 135)
-#define HID_SMA_EXISTS              (HID_SMA_START + 136)
-#define HID_SMA_FORALL              (HID_SMA_START + 137)
-#define HID_SMA_NABLA               (HID_SMA_START + 138)
-#define HID_SMA_INTX                (HID_SMA_START + 139)
-#define HID_SMA_IINTX               (HID_SMA_START + 140)
-#define HID_SMA_IIINTX              (HID_SMA_START + 141)
-#define HID_SMA_LINTX               (HID_SMA_START + 142)
-#define HID_SMA_LLINTX              (HID_SMA_START + 143)
-#define HID_SMA_LLLINTX             (HID_SMA_START + 144)
-#define HID_SMA_FROMX               (HID_SMA_START + 145)
-#define HID_SMA_TOX                 (HID_SMA_START + 146)
-#define HID_SMA_FROMXTOY            (HID_SMA_START + 147)
-#define HID_SMA_XCIRCY              (HID_SMA_START + 148)
-#define HID_SMA_XDIVIDESY           (HID_SMA_START + 149)
-#define HID_SMA_XNDIVIDESY          (HID_SMA_START + 150)
-#define HID_SMA_DLARROW             (HID_SMA_START + 151)
-#define HID_SMA_DLRARROW            (HID_SMA_START + 152)
-#define HID_SMA_DRARROW             (HID_SMA_START + 153)
-
-#define HID_SMA_MISC_CAT            (HID_SMA_START + 154)
-#define HID_SMA_UNBINOPS_CAT        (HID_SMA_START + 155)
-#define HID_SMA_RELATIONS_CAT       (HID_SMA_START + 156)
-#define HID_SMA_SETOPERATIONS_CAT   (HID_SMA_START + 157)
-#define HID_SMA_FUNCTIONS_CAT       (HID_SMA_START + 158)
-#define HID_SMA_OPERATORS_CAT       (HID_SMA_START + 159)
-#define HID_SMA_ATTRIBUTES_CAT      (HID_SMA_START + 160)
-#define HID_SMA_BRACKETS_CAT        (HID_SMA_START + 161)
-#define HID_SMA_FORMAT_CAT          (HID_SMA_START + 162)
-
-#define HID_SMA_OPERATOR_WIN        (HID_SMA_START + 163)
-#define HID_SMA_UNBINOPS_TBX        (HID_SMA_START + 164)
-#define HID_SMA_RELATIONS_TBX       (HID_SMA_START + 165)
-#define HID_SMA_SETOPERATIONS_TBX   (HID_SMA_START + 166)
-#define HID_SMA_FUNCTIONS_TBX       (HID_SMA_START + 167)
-#define HID_SMA_OPERATORS_TBX       (HID_SMA_START + 168)
-#define HID_SMA_ATTRIBUTES_TBX      (HID_SMA_START + 169)
-#define HID_SMA_BRACKETS_TBX        (HID_SMA_START + 170)
-#define HID_SMA_FORMAT_TBX          (HID_SMA_START + 171)
-#define HID_SMA_SELECTION_TBX       (HID_SMA_START + 172)
-#define HID_SMA_COMMAND_WIN         (HID_SMA_START + 173)
-#define HID_SMA_MISC_MENU           (HID_SMA_START + 174)
-#define HID_SMA_FUNCTIONSOTHER1_MENU    (HID_SMA_START + 175)
-
-#define HID_SMA_ACUTEX              (HID_SMA_START + 180)
-#define HID_SMA_BARX                (HID_SMA_START + 181)
-#define HID_SMA_BREVEX              (HID_SMA_START + 182)
-#define HID_SMA_CHECKX              (HID_SMA_START + 183)
-#define HID_SMA_CIRCLEX             (HID_SMA_START + 184)
-#define HID_SMA_DOTX                (HID_SMA_START + 185)
-#define HID_SMA_DDOTX               (HID_SMA_START + 186)
-#define HID_SMA_DDDOTX              (HID_SMA_START + 187)
-#define HID_SMA_GRAVEX              (HID_SMA_START + 188)
-#define HID_SMA_HATX                (HID_SMA_START + 189)
-#define HID_SMA_TILDEX              (HID_SMA_START + 190)
-#define HID_SMA_VECX                (HID_SMA_START + 191)
-#define HID_SMA_UNDERLINEX          (HID_SMA_START + 192)
-#define HID_SMA_OVERLINEX           (HID_SMA_START + 193)
-#define HID_SMA_OVERSTRIKEX         (HID_SMA_START + 194)
-#define HID_SMA_PHANTOMX            (HID_SMA_START + 195)
-#define HID_SMA_BOLDX               (HID_SMA_START + 196)
-#define HID_SMA_ITALX               (HID_SMA_START + 197)
-#define HID_SMA_SIZEXY              (HID_SMA_START + 198)
-#define HID_SMA_FONTXY              (HID_SMA_START + 199)
-#define HID_SMA_COLORX              (HID_SMA_START + 200)
-#define HID_SMA_LRGROUPX            (HID_SMA_START + 201)
-#define HID_SMA_LRPARENTX           (HID_SMA_START + 202)
-#define HID_SMA_LRBRACKETX          (HID_SMA_START + 203)
-#define HID_SMA_LRBRACEX            (HID_SMA_START + 204)
-#define HID_SMA_LRANGLEX            (HID_SMA_START + 205)
-#define HID_SMA_LRCEILX             (HID_SMA_START + 206)
-#define HID_SMA_LRFLOORX            (HID_SMA_START + 207)
-#define HID_SMA_LRLINEX             (HID_SMA_START + 208)
-#define HID_SMA_LRDLINEX            (HID_SMA_START + 209)
-#define HID_SMA_SLRPARENTX          (HID_SMA_START + 210)
-#define HID_SMA_SLRBRACKETX         (HID_SMA_START + 211)
-#define HID_SMA_SLRBRACEX           (HID_SMA_START + 212)
-#define HID_SMA_SLRANGLEX           (HID_SMA_START + 213)
-#define HID_SMA_SLRCEILX            (HID_SMA_START + 214)
-#define HID_SMA_SLRFLOORX           (HID_SMA_START + 215)
-#define HID_SMA_SLRLINEX            (HID_SMA_START + 216)
-#define HID_SMA_SLRDLINEX           (HID_SMA_START + 217)
-#define HID_SMA_RSUBX               (HID_SMA_START + 218)
-#define HID_SMA_RSUPX               (HID_SMA_START + 219)
-#define HID_SMA_LSUBX               (HID_SMA_START + 220)
-#define HID_SMA_LSUPX               (HID_SMA_START + 221)
-#define HID_SMA_SBLANK              (HID_SMA_START + 222)
-#define HID_SMA_BLANK               (HID_SMA_START + 223)
-#define HID_SMA_NEWLINE             (HID_SMA_START + 224)
-#define HID_SMA_BINOMXY             (HID_SMA_START + 225)
-#define HID_SMA_STACK               (HID_SMA_START + 226)
-#define HID_SMA_MATRIX              (HID_SMA_START + 227)
-#define HID_SMA_ALIGNLX             (HID_SMA_START + 228)
-#define HID_SMA_ALIGNCX             (HID_SMA_START + 229)
-#define HID_SMA_ALIGNRX             (HID_SMA_START + 230)
-#define HID_SMA_ALEPH               (HID_SMA_START + 231)
-#define HID_SMA_EMPTYSET            (HID_SMA_START + 232)
-#define HID_SMA_RE                  (HID_SMA_START + 233)
-#define HID_SMA_IM                  (HID_SMA_START + 234)
-#define HID_SMA_INFINITY            (HID_SMA_START + 235)
-#define HID_SMA_PARTIAL             (HID_SMA_START + 236)
-#define HID_SMA_WP                  (HID_SMA_START + 237)
-#define HID_SMA_DOTSAXIS            (HID_SMA_START + 238)
-#define HID_SMA_DOTSUP              (HID_SMA_START + 239)
-#define HID_SMA_DOTSDOWN            (HID_SMA_START + 240)
-#define HID_SMA_DOTSLOW             (HID_SMA_START + 241)
-#define HID_SMA_DOTSVERT            (HID_SMA_START + 242)
-#define HID_SMA_NOSPACE             (HID_SMA_START + 243)
-
-#define HID_SMA_SETN                (HID_SMA2_START + 1)
-#define HID_SMA_SETZ                (HID_SMA2_START + 2)
-#define HID_SMA_SETQ                (HID_SMA2_START + 3)
-#define HID_SMA_SETR                (HID_SMA2_START + 4)
-#define HID_SMA_SETC                (HID_SMA2_START + 5)
-#define HID_SMA_WIDEHATX            (HID_SMA2_START + 6)
-#define HID_SMA_WIDETILDEX          (HID_SMA2_START + 7)
-#define HID_SMA_WIDEVECX            (HID_SMA2_START + 8)
-#define HID_SMA_CSUBX               (HID_SMA2_START + 9)
-#define HID_SMA_CSUPX               (HID_SMA2_START + 10)
-#define HID_SMA_HBAR                (HID_SMA2_START + 11)
-#define HID_SMA_LAMBDABAR           (HID_SMA2_START + 12)
-#define HID_SMA_LEFTARROW           (HID_SMA2_START + 13)
-#define HID_SMA_RIGHTARROW          (HID_SMA2_START + 14)
-#define HID_SMA_UPARROW             (HID_SMA2_START + 15)
-#define HID_SMA_DOWNARROW           (HID_SMA2_START + 16)
-
-#define HID_SMA_DEFAULT_DIST        (HID_SMA2_START + 17)
-#define HID_SMA_LINE_DIST           (HID_SMA2_START + 18)
-#define HID_SMA_ROOT_DIST           (HID_SMA2_START + 19)
-#define HID_SMA_SUP_DIST            (HID_SMA2_START + 20)
-#define HID_SMA_SUB_DIST            (HID_SMA2_START + 21)
-#define HID_SMA_NUMERATOR_DIST      (HID_SMA2_START + 22)
-#define HID_SMA_DENOMINATOR_DIST    (HID_SMA2_START + 23)
-#define HID_SMA_FRACLINE_EXCWIDTH   (HID_SMA2_START + 24)
-#define HID_SMA_FRACLINE_LINEWIDTH  (HID_SMA2_START + 25)
-#define HID_SMA_UPPERLIMIT_DIST     (HID_SMA2_START + 26)
-#define HID_SMA_LOWERLIMIT_DIST     (HID_SMA2_START + 27)
-#define HID_SMA_BRACKET_EXCHEIGHT   (HID_SMA2_START + 28)
-#define HID_SMA_BRACKET_DIST        (HID_SMA2_START + 29)
-#define HID_SMA_MATRIXROW_DIST      (HID_SMA2_START + 30)
-#define HID_SMA_MATRIXCOL_DIST      (HID_SMA2_START + 31)
-#define HID_SMA_ATTRIBUT_DIST       (HID_SMA2_START + 32)
-#define HID_SMA_INTERATTRIBUT_DIST  (HID_SMA2_START + 33)
-#define HID_SMA_OPERATOR_EXCHEIGHT  (HID_SMA2_START + 34)
-#define HID_SMA_OPERATOR_DIST       (HID_SMA2_START + 35)
-#define HID_SMA_LEFTBORDER_DIST     (HID_SMA2_START + 36)
-#define HID_SMA_RIGHTBORDER_DIST    (HID_SMA2_START + 37)
-#define HID_SMA_UPPERBORDER_DIST    (HID_SMA2_START + 38)
-#define HID_SMA_LOWERBORDER_DIST    (HID_SMA2_START + 39)
-#define HID_SMA_SCALE_ALL_BRACKETS  (HID_SMA2_START + 40)
-#define HID_SMA_BRACKET_EXCHEIGHT2  (HID_SMA2_START + 41)
-#define HID_SMA_LMRANGLEXY          (HID_SMA2_START + 42)
-#define HID_SMA_SLMRANGLEXY         (HID_SMA2_START + 43)
-#define HID_SMA_XWIDESLASHY         (HID_SMA2_START + 44)
-#define HID_SMA_XWIDEBSLASHY        (HID_SMA2_START + 45)
-#define HID_SMA_XOVERBRACEY         (HID_SMA2_START + 46)
-#define HID_SMA_XUNDERBRACEY        (HID_SMA2_START + 47)
-#define HID_SMA_LRDBRACKETX         (HID_SMA2_START + 48)
-#define HID_SMA_SLRDBRACKETX        (HID_SMA2_START + 49)
-
-#define HID_SMA_CONTROL_SYMBOLSET_VIEW  (HID_SMA2_START + 50)
-#define HID_SMA_CONTROL_FONTCHAR_VIEW   (HID_SMA2_START + 51)
-
 #define BMP_ARROW_RIGHT     1
 
 #define MN_WIN 60
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 21ae6c0e63df..c8db4720b943 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -48,8 +48,6 @@ static const char* aRootName = "Office.Math";
 #define SYMBOL_LIST         "SymbolList"
 #define FONT_FORMAT_LIST    "FontFormatList"
 
-SV_IMPL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry );
-
 /////////////////////////////////////////////////////////////////
 
 
@@ -294,10 +292,9 @@ SmFontFormatList::SmFontFormatList()
 
 void SmFontFormatList::Clear()
 {
-    USHORT nCnt = aEntries.Count();
-    if (nCnt)
+    if (!aEntries.empty())
     {
-        aEntries.Remove( 0, nCnt );
+        aEntries.clear();
         SetModified( TRUE );
     }
 }
@@ -311,7 +308,7 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
     if (!pFntFmt)
     {
         SmFntFmtListEntry aEntry( rFntFmtId, rFntFmt );
-        aEntries.Insert( aEntry, aEntries.Count() );
+        aEntries.push_back( aEntry );
         SetModified( TRUE );
     }
 }
@@ -319,35 +316,32 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
 
 void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId )
 {
-    USHORT nPos = 0xFFFF;
 
     // search for entry
-    USHORT nCnt = aEntries.Count();
-    for (USHORT i = 0;  i < nCnt  &&  nPos == 0xFFFF;  ++i)
+    for (size_t i = 0;  i < aEntries.size();  ++i)
     {
         if (aEntries[i].aId == rFntFmtId)
-            nPos = i;
-    }
-
-    // remove entry if found
-    if (nPos != 0xFFFF)
-    {
-        aEntries.Remove( nPos );
-        SetModified( TRUE );
+        {
+            // remove entry if found
+            aEntries.erase( aEntries.begin() + i );
+            SetModified( TRUE );
+            break;
+        }
     }
 }
 
 
 const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId ) const
 {
-    SmFontFormat *pRes = 0;
+    const SmFontFormat *pRes = 0;
 
-    USHORT nCnt = aEntries.Count();
-    USHORT i;
-    for (i = 0;  i < nCnt  &&  !pRes;  ++i)
+    for (size_t i = 0;  i < aEntries.size();  ++i)
     {
         if (aEntries[i].aId == rFntFmtId)
+        {
             pRes = &aEntries[i].aFntFmt;
+            break;
+        }
     }
 
     return pRes;
@@ -355,11 +349,11 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId )
 
 
 
-const SmFontFormat * SmFontFormatList::GetFontFormat( USHORT nPos ) const
+const SmFontFormat * SmFontFormatList::GetFontFormat( size_t nPos ) const
 {
-    SmFontFormat *pRes = 0;
-    if (nPos < aEntries.Count())
-        pRes = &aEntries[ nPos ].aFntFmt;
+    const SmFontFormat *pRes = 0;
+    if (nPos < aEntries.size())
+        pRes = &aEntries[nPos].aFntFmt;
     return pRes;
 }
 
@@ -368,12 +362,13 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) co
 {
     String aRes;
 
-    USHORT nCnt = aEntries.Count();
-    USHORT i;
-    for (i = 0;  i < nCnt  &&  0 == aRes.Len();  ++i)
+    for (size_t i = 0;  i < aEntries.size();  ++i)
     {
         if (aEntries[i].aFntFmt == rFntFmt)
+        {
             aRes = aEntries[i].aId;
+            break;
+        }
     }
 
     return aRes;
@@ -392,10 +387,10 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, BOO
 }
 
 
-const String SmFontFormatList::GetFontFormatId( USHORT nPos ) const
+const String SmFontFormatList::GetFontFormatId( size_t nPos ) const
 {
     String aRes;
-    if (nPos < aEntries.Count())
+    if (nPos < aEntries.size())
         aRes = aEntries[nPos].aId;
     return aRes;
 }
@@ -409,12 +404,15 @@ const String SmFontFormatList::GetNewFontFormatId() const
 
     String aPrefix( RTL_CONSTASCII_STRINGPARAM( "Id" ) );
     INT32 nCnt = GetCount();
-    for (INT32 i = 1;  i <= nCnt + 1  &&  0 == aRes.Len();  ++i)
+    for (INT32 i = 1;  i <= nCnt + 1;  ++i)
     {
         String aTmpId( aPrefix );
         aTmpId += String::CreateFromInt32( i );
         if (!GetFontFormat( aTmpId ))
+        {
             aRes = aTmpId;
+            break;
+        }
     }
     DBG_ASSERT( 0 != aRes.Len(), "failed to create new FontFormatId" );
 
@@ -767,14 +765,14 @@ void SmMathConfig::SaveFontFormatList()
     Sequence< OUString > aNames = lcl_GetFontPropertyNames();
     INT32 nSymbolProps = aNames.getLength();
 
-    USHORT nCount = rFntFmtList.GetCount();
+    size_t nCount = rFntFmtList.GetCount();
 
     Sequence< PropertyValue > aValues( nCount * nSymbolProps );
     PropertyValue *pValues = aValues.getArray();
 
     PropertyValue *pVal = pValues;
     OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
-    for (USHORT i = 0;  i < nCount;  ++i)
+    for (size_t i = 0;  i < nCount;  ++i)
     {
         String aFntFmtId( rFntFmtList.GetFontFormatId( i ) );
         const SmFontFormat aFntFmt( *rFntFmtList.GetFontFormat( aFntFmtId ) );
@@ -817,7 +815,8 @@ void SmMathConfig::SaveFontFormatList()
         pVal->Value <<= (INT16) aFntFmt.nItalic;
         pVal++;
     }
-    DBG_ASSERT( pVal - pValues == nCount * nSymbolProps, "properties missing" );
+    DBG_ASSERT( static_cast<size_t>(pVal - pValues) == (nCount * nSymbolProps),
+            "properties missing" );
     ReplaceSetProperties( A2OU( FONT_FORMAT_LIST ) , aValues );
 
     rFntFmtList.SetModified( FALSE );
@@ -826,13 +825,12 @@ void SmMathConfig::SaveFontFormatList()
 
 void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
 {
-    size_t nCount = rSymbols.size();
-    USHORT i;
+    size_t i;
 
     // build list of used font-formats only
     //!! font-format IDs may be different !!
     SmFontFormatList aUsedList;
-    for (i = 0;  i < nCount;  ++i)
+    for (i = 0;  i < rSymbols.size();  ++i)
     {
         DBG_ASSERT( rSymbols[i].GetName().Len() > 0, "non named symbol" );
         aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , TRUE );
@@ -845,14 +843,14 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
 
     // remove unused font-formats from list
     SmFontFormatList &rFntFmtList = GetFontFormatList();
-    USHORT nCnt = rFntFmtList.GetCount();
+    size_t nCnt = rFntFmtList.GetCount();
     SmFontFormat *pTmpFormat = new SmFontFormat[ nCnt ];
     String       *pId     = new String      [ nCnt ];
-    INT32 k;
+    size_t k;
     for (k = 0;  k < nCnt;  ++k)
     {
-        pTmpFormat[k] = *rFntFmtList.GetFontFormat( (USHORT) k );
-        pId[k]     = rFntFmtList.GetFontFormatId( (USHORT) k );
+        pTmpFormat[k] = *rFntFmtList.GetFontFormat( k );
+        pId[k]     = rFntFmtList.GetFontFormatId( k );
     }
     for (k = 0;  k < nCnt;  ++k)
     {
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 9e4aa9f39f2f..8e3330a6466f 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -32,6 +32,7 @@
 #ifndef _MATH_CFGITEM_HXX_
 #define _MATH_CFGITEM_HXX_
 
+#include <deque>
 #include <vector>
 
 #include <com/sun/star/beans/PropertyValues.hpp>
@@ -41,7 +42,6 @@
 #include <tools/solar.h>
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
-#include <svl/svarray.hxx>
 #include <vcl/timer.hxx>
 
 #include <symbol.hxx>
@@ -82,14 +82,10 @@ struct SmFntFmtListEntry
     SmFntFmtListEntry( const String &rId, const SmFontFormat &rFntFmt );
 };
 
-
-SV_DECL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry, 8, 8 )
-
-
 class SmFontFormatList
 {
-    SmFntFmtListEntryArr    aEntries;
-    BOOL                    bModified;
+    std::deque<SmFntFmtListEntry> aEntries;
+    BOOL                          bModified;
 
     // disallow copy-constructor and assignment-operator for now
     SmFontFormatList( const SmFontFormatList & );
@@ -103,12 +99,12 @@ public:
     void    RemoveFontFormat( const String &rFntFmtId );
 
     const SmFontFormat *    GetFontFormat( const String &rFntFmtId ) const;
-    const SmFontFormat *    GetFontFormat( USHORT nPos ) const;
+    const SmFontFormat *    GetFontFormat( size_t nPos ) const;
     const String            GetFontFormatId( const SmFontFormat &rFntFmt ) const;
     const String            GetFontFormatId( const SmFontFormat &rFntFmt, BOOL bAdd );
-    const String            GetFontFormatId( USHORT nPos ) const;
+    const String            GetFontFormatId( size_t nPos ) const;
     const String            GetNewFontFormatId() const;
-    USHORT                  GetCount() const    { return aEntries.Count(); }
+    size_t                  GetCount() const    { return aEntries.size(); }
 
     BOOL    IsModified() const          { return bModified; }
     void    SetModified( BOOL bVal )    { bModified = bVal; }
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index ee1de4b5dbbb..a33ab14a98bf 100755..100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -765,7 +765,7 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox )
 }
 
 
-void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
+void SmDistanceDialog::SetHelpId(MetricField &rField, const rtl::OString& sHelpId)
 {
     //! HelpID's die auf diese Weise explizit gesetzt werden, muessen im
     //! util Verzeichnis im File "hidother.src" mit Hilfe von "hidspecial"
@@ -776,7 +776,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
     DBG_ASSERT(aEmptyText.Len() == 0, "Sm: Ooops...");
 #endif
 
-    rField.SetHelpId(nHelpId);
+    rField.SetHelpId(sHelpId);
     rField.SetHelpText(aEmptyText);
 
     // since MetricField inherits from SpinField which has a sub Edit field
@@ -784,7 +784,8 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
     // for it too.
     Edit *pSubEdit = rField.GetSubEdit();
     if (pSubEdit)
-    {   pSubEdit->SetHelpId(nHelpId);
+    {
+        pSubEdit->SetHelpId(sHelpId);
         pSubEdit->SetHelpText(aEmptyText);
     }
 }
@@ -802,7 +803,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
 #if OSL_DEBUG_LEVEL > 1
     DBG_ASSERT(NOCATEGORIES == 10, "Sm : Array passt nicht zu Anzahl der Kategorien");
 #endif
-    ULONG __READONLY_DATA  aCatMf2Hid[10][4] =
+    const char* __READONLY_DATA  aCatMf2Hid[10][4] =
     {
         { HID_SMA_DEFAULT_DIST,         HID_SMA_LINE_DIST,          HID_SMA_ROOT_DIST, 0 },
         { HID_SMA_SUP_DIST,             HID_SMA_SUB_DIST ,          0, 0 },
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index ab1382b97879..243e16fb6504 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -38,6 +38,8 @@
 #include <comphelper/storagehelper.hxx>
 #include <rtl/logfile.hxx>
 #include <rtl/ustring.hxx>
+#include <unotools/eventcfg.hxx>
+#include <sfx2/event.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/docfile.hxx>
@@ -180,7 +182,14 @@ void SmDocShell::SetText(const String& rBuffer)
         {
             pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_TEXT);
             if ( SFX_CREATE_MODE_EMBEDDED == GetCreateMode() )
+            {
+                // have SwOleClient::FormatChanged() to align the modified formula properly
+                // even if the vis area does not change (e.g. when formula text changes from
+                // "{a over b + c} over d" to "d over {a over b + c}"
+                SFX_APP()->NotifyEvent(SfxEventHint( SFX_EVENT_VISAREACHANGED, GlobalEventConfig::GetEventName(STR_EVENT_VISAREACHANGED), this));
+
                 Repaint();
+            }
             else
                 pViewSh->GetGraphicWindow().Invalidate();
         }
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index d8e2586e151e..b1d7d9e69210 100755
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -573,6 +573,13 @@ const SmNode * SmNode::FindNodeWithAccessibleIndex(xub_StrLen nAccIdx) const
     return pResult;
 }
 
+
+long SmNode::GetFormulaBaseline() const
+{
+    DBG_ASSERT( 0, "This dummy implementation should not have been called." );
+    return 0;
+}
+
 ///////////////////////////////////////////////////////////////////////////
 
 SmStructureNode::SmStructureNode( const SmStructureNode &rNode ) :
@@ -763,7 +770,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
         }
 
     Point  aPos;
-    SmRect::operator = (SmRect(nMaxWidth, 0));
+    SmRect::operator = (SmRect(nMaxWidth, 1));
     for (i = 0;  i < nSize;  i++)
     {   if (NULL != (pNode = GetSubNode(i)))
         {   const SmRect &rNodeRect = pNode->GetRect();
@@ -779,6 +786,22 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
             ExtendBy(rNodeRect, nSize > 1 ? RCP_NONE : RCP_ARG);
         }
     }
+    // --> 4.7.2010 #i972#
+    if (HasBaseline())
+        nFormulaBaseline = GetBaseline();
+    else
+    {
+        SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
+        aTmpDev.SetFont(GetFont());
+
+        SmRect aRect = (SmRect(aTmpDev, &rFormat, C2S("a"),
+                               GetFont().GetBorderWidth()));
+        nFormulaBaseline = GetAlignM();
+        // move from middle position by constant - distance
+        // between middle and baseline for single letter
+        nFormulaBaseline += aRect.GetBaseline() - aRect.GetAlignM();
+    }
+    // <--
 }
 
 
@@ -788,6 +811,12 @@ SmNode * SmTableNode::GetLeftMost()
 }
 
 
+long SmTableNode::GetFormulaBaseline() const
+{
+    return nFormulaBaseline;
+}
+
+
 /**************************************************************************/
 
 
@@ -818,20 +847,21 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
     SmTmpDevice  aTmpDev ((OutputDevice &) rDev, TRUE);
     aTmpDev.SetFont(GetFont());
 
-    // provide an empty rectangle with alignment parameters for the "current"
-    // font (in order to make "a^1 {}_2^3 a_4" work correct, that is, have the
-    // same sub-/supscript positions.)
-    //! be sure to use a character that has explicitly defined HiAttribut
-    //! line in rect.cxx such as 'a' in order to make 'vec a' look same to
-    //! 'vec {a}'.
-    SmRect::operator = (SmRect(aTmpDev, &rFormat, C2S("a"),
-                               GetFont().GetBorderWidth()));
-    // make sure that the rectangle occupies (almost) no space
-    SetWidth(1);
-    SetItalicSpaces(0, 0);
-
     if (nSize < 1)
+    {
+        // provide an empty rectangle with alignment parameters for the "current"
+        // font (in order to make "a^1 {}_2^3 a_4" work correct, that is, have the
+        // same sub-/supscript positions.)
+        //! be sure to use a character that has explicitly defined HiAttribut
+        //! line in rect.cxx such as 'a' in order to make 'vec a' look same to
+        //! 'vec {a}'.
+        SmRect::operator = (SmRect(aTmpDev, &rFormat, C2S("a"),
+                            GetFont().GetBorderWidth()));
+        // make sure that the rectangle occupies (almost) no space
+        SetWidth(1);
+        SetItalicSpaces(0, 0);
         return;
+    }
 
     // make distance depend on font size
     long nDist = (rFormat.GetDistance(DIS_HORIZONTAL) * GetFont().GetSize().Height()) / 100L;
@@ -839,14 +869,17 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
         nDist = 0;
 
     Point   aPos;
-    for (i = 0;  i < nSize;  i++)
+    // copy the first node into LineNode and extend by the others
+    if (NULL != (pNode = GetSubNode(0)))
+        SmRect::operator = (pNode->GetRect());
+
+    for (i = 1;  i < nSize;  i++)
         if (NULL != (pNode = GetSubNode(i)))
         {
             aPos = pNode->AlignTo(*this, RP_RIGHT, RHA_CENTER, RVA_BASELINE);
 
-            // no horizontal space before first node
-            if (i)
-                aPos.X() += nDist;
+            // add horizontal space to the left for each but the first sub node
+            aPos.X() += nDist;
 
             pNode->MoveTo(aPos);
             ExtendBy( *pNode, RCP_XOR );
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index da6259076adc..9dcd4d05930d 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -336,16 +336,6 @@ void SmModule::GetState(SfxItemSet &rSet)
         }
 }
 
-void SmModule::FillStatusBar(StatusBar &rBar)
-{
-    rBar.InsertItem(SID_TEXTSTATUS, 300, SIB_LEFT | SIB_IN);
-    rBar.InsertItem(SID_ATTR_ZOOM, rBar.GetTextWidth(C2S(" 100% ")));
-    rBar.InsertItem(SID_MODIFYSTATUS, rBar.GetTextWidth(C2S(" * ")));
-    rBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rBar ), SIB_USERDRAW );
-    rBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE);
-
-}
-
 /* -----------------15.02.99 12:45-------------------
  *
  * --------------------------------------------------*/
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index b02ad4a0cc6e..e608b1c9108d 100755..100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -30,6 +30,8 @@
 #include <svx/globlmn.hrc>
 #include "starmath.hrc"
 #include "dialog.hrc"
+#include "toolbox.hrc"
+#include "smcommands.h"
 
 #define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
 #define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
@@ -41,6 +43,7 @@
 
 ModalDialog RID_FONTDIALOG
 {
+    HelpID = "starmath:ModalDialog:RID_FONTDIALOG";
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
@@ -55,6 +58,7 @@ ModalDialog RID_FONTDIALOG
     };
     ComboBox 1
     {
+        HelpID = "starmath:ComboBox:RID_FONTDIALOG:1";
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 111 , 60 ) ;
         TabStop = TRUE ;
@@ -63,6 +67,7 @@ ModalDialog RID_FONTDIALOG
     };
     CheckBox 1
     {
+        HelpID = "starmath:CheckBox:RID_FONTDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 60 , 84 ) ;
         Size = MAP_APPFONT ( 33 , 10 ) ;
@@ -70,6 +75,7 @@ ModalDialog RID_FONTDIALOG
     };
     CheckBox 2
     {
+        HelpID = "starmath:CheckBox:RID_FONTDIALOG:2";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 60 , 97 ) ;
         Size = MAP_APPFONT ( 33 , 10 ) ;
@@ -108,7 +114,7 @@ ModalDialog RID_FONTSIZEDIALOG
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    HelpID = SID_FONTSIZE ;
+    HelpId = CMD_SID_FONTSIZE ;
     Size = MAP_APPFONT ( 171 , 120 ) ;
     Text [ en-US ] = "Font Sizes" ;
     FixedText 1
@@ -120,6 +126,7 @@ ModalDialog RID_FONTSIZEDIALOG
     };
     MetricField 1
     {
+        HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 57 , 6 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -140,6 +147,7 @@ ModalDialog RID_FONTSIZEDIALOG
     };
     MetricField 4
     {
+        HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 57 , 36 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -161,6 +169,7 @@ ModalDialog RID_FONTSIZEDIALOG
     };
     MetricField 5
     {
+        HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:5";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 57 , 51 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -182,6 +191,7 @@ ModalDialog RID_FONTSIZEDIALOG
     };
     MetricField 6
     {
+        HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:6";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 57 , 66 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -203,6 +213,7 @@ ModalDialog RID_FONTSIZEDIALOG
     };
     MetricField 7
     {
+        HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:7";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 57 , 81 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -224,6 +235,7 @@ ModalDialog RID_FONTSIZEDIALOG
     };
     MetricField 8
     {
+        HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:8";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 57 , 96 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -257,6 +269,7 @@ ModalDialog RID_FONTSIZEDIALOG
     };
     PushButton 1
     {
+        HelpID = "starmath:PushButton:RID_FONTSIZEDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 114 , 45 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -268,7 +281,7 @@ ModalDialog RID_FONTTYPEDIALOG
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    HelpID = SID_FONT ;
+    HelpId = CMD_SID_FONT ;
     Size = MAP_APPFONT ( 282 , 153 ) ;
     Text [ en-US ] = "Fonts" ;
     Moveable = TRUE ;
@@ -293,6 +306,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     ListBox 1
     {
+        HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 18 ) ;
         Size = MAP_APPFONT ( 150 , 69 ) ;
@@ -308,6 +322,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     ListBox 2
     {
+        HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 33 ) ;
         Size = MAP_APPFONT ( 150 , 69 ) ;
@@ -323,6 +338,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     ListBox 3
     {
+        HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 48 ) ;
         Size = MAP_APPFONT ( 150 , 69 ) ;
@@ -338,6 +354,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     ListBox 4
     {
+        HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 63 ) ;
         Size = MAP_APPFONT ( 150 , 69 ) ;
@@ -353,6 +370,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     ListBox 5
     {
+        HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:5";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 96 ) ;
         Size = MAP_APPFONT ( 150 , 69 ) ;
@@ -368,6 +386,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     ListBox 6
     {
+        HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:6";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 111 ) ;
         Size = MAP_APPFONT ( 150 , 69 ) ;
@@ -383,6 +402,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     ListBox 7
     {
+        HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:7";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 126 ) ;
         Size = MAP_APPFONT ( 150 , 69 ) ;
@@ -404,6 +424,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     MenuButton 1
     {
+        HelpID = "starmath:MenuButton:RID_FONTTYPEDIALOG:1";
         TabStop = TRUE ;
         ButtonMenu = Menu , RID_FONTMENU ;
         Pos = MAP_APPFONT ( 225 , 48 ) ;
@@ -412,6 +433,7 @@ ModalDialog RID_FONTTYPEDIALOG
     };
     PushButton 2
     {
+        HelpID = "starmath:PushButton:RID_FONTTYPEDIALOG:2";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 225 , 66 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -424,7 +446,7 @@ ModalDialog RID_DISTANCEDIALOG
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    HelpID = SID_DISTANCE ;
+    HelpId = CMD_SID_DISTANCE ;
     Size = MAP_APPFONT ( 240 , 90 ) ;
     Text [ en-US ] = "Spacing" ;
     FixedText 1
@@ -435,6 +457,7 @@ ModalDialog RID_DISTANCEDIALOG
     };
     MetricField 1
     {
+        HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:1";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -455,6 +478,7 @@ ModalDialog RID_DISTANCEDIALOG
     };
     MetricField 2
     {
+        HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:2";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -467,6 +491,7 @@ ModalDialog RID_DISTANCEDIALOG
     };
     CheckBox 1
     {
+        HelpID = "starmath:CheckBox:RID_DISTANCEDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 55 ) ;
         Size = MAP_APPFONT ( 110 , 12 ) ;
@@ -482,6 +507,7 @@ ModalDialog RID_DISTANCEDIALOG
     };
     MetricField 3
     {
+        HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:3";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -502,6 +528,7 @@ ModalDialog RID_DISTANCEDIALOG
     };
     MetricField 4
     {
+        HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:4";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -527,6 +554,7 @@ ModalDialog RID_DISTANCEDIALOG
     };
     PushButton 1
     {
+        HelpID = "starmath:PushButton:RID_DISTANCEDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 184 , 69 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -534,6 +562,7 @@ ModalDialog RID_DISTANCEDIALOG
     };
     MenuButton 1
     {
+        HelpID = "starmath:MenuButton:RID_DISTANCEDIALOG:1";
         TabStop = TRUE ;
         ButtonMenu = Menu , RID_DISTANCEMENU ;
         Pos = MAP_APPFONT ( 184 , 51 ) ;
@@ -918,11 +947,12 @@ ModalDialog RID_ALIGNDIALOG
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    HelpID = SID_ALIGN ;
+    HelpId = CMD_SID_ALIGN ;
     Size = MAP_APPFONT ( 139 , 66 ) ;
     Text [ en-US ] = "Alignment" ;
     RadioButton 1
     {
+        HelpID = "starmath:RadioButton:RID_ALIGNDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 17 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -930,6 +960,7 @@ ModalDialog RID_ALIGNDIALOG
     };
     RadioButton 2
     {
+        HelpID = "starmath:RadioButton:RID_ALIGNDIALOG:2";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 31 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -937,6 +968,7 @@ ModalDialog RID_ALIGNDIALOG
     };
     RadioButton 3
     {
+        HelpID = "starmath:RadioButton:RID_ALIGNDIALOG:3";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 44 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
@@ -963,6 +995,7 @@ ModalDialog RID_ALIGNDIALOG
     };
     PushButton 1
     {
+        HelpID = "starmath:PushButton:RID_ALIGNDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 83 , 46 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -972,6 +1005,7 @@ ModalDialog RID_ALIGNDIALOG
 
 TabPage RID_PRINTOPTIONPAGE
 {
+    HelpID = "starmath:TabPage:RID_PRINTOPTIONPAGE";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
@@ -984,6 +1018,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     CheckBox CB_TITLEROW
     {
+        HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_TITLEROW";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
@@ -991,6 +1026,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     CheckBox CB_EQUATION_TEXT
     {
+        HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_EQUATION_TEXT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
@@ -998,6 +1034,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     CheckBox CB_FRAME
     {
+        HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_FRAME";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
@@ -1011,6 +1048,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     RadioButton RB_ORIGINAL_SIZE
     {
+        HelpID = "starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ORIGINAL_SIZE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 69 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
@@ -1018,6 +1056,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     RadioButton RB_FIT_TO_PAGE
     {
+        HelpID = "starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_FIT_TO_PAGE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 83 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
@@ -1025,6 +1064,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     RadioButton RB_ZOOM
     {
+        HelpID = "starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ZOOM";
         Pos = MAP_APPFONT ( 12 , 97 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "~Scaling" ;
@@ -1032,6 +1072,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     MetricField MF_ZOOM
     {
+        HelpID = "starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 18 , 111 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1052,6 +1093,7 @@ TabPage RID_PRINTOPTIONPAGE
     };
     CheckBox CB_IGNORE_SPACING
     {
+        HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 140 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
@@ -1061,6 +1103,7 @@ TabPage RID_PRINTOPTIONPAGE
 
 ModalDialog RID_SYMBOLDIALOG
 {
+    HelpID = "starmath:ModalDialog:RID_SYMBOLDIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Closeable = TRUE;   // Close Button in Window Leiste explizit einbauen
@@ -1076,6 +1119,7 @@ ModalDialog RID_SYMBOLDIALOG
     };
     ListBox 1
     {
+        HelpID = "starmath:ListBox:RID_SYMBOLDIALOG:1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 92, 57 ) ;
@@ -1107,6 +1151,7 @@ ModalDialog RID_SYMBOLDIALOG
     };
     PushButton 2
     {
+        HelpID = "starmath:PushButton:RID_SYMBOLDIALOG:2";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 177 , 6 ) ;
         Size = MAP_APPFONT ( 56 , 14 ) ;
@@ -1115,6 +1160,7 @@ ModalDialog RID_SYMBOLDIALOG
     };
     PushButton 3
     {
+        HelpID = "starmath:PushButton:RID_SYMBOLDIALOG:3";
         Pos = MAP_APPFONT ( 177 , 24 ) ;
         Size = MAP_APPFONT ( 56 , 14 ) ;
         TabStop = TRUE ;
@@ -1122,6 +1168,7 @@ ModalDialog RID_SYMBOLDIALOG
     };
     PushButton 1
     {
+        HelpID = "starmath:PushButton:RID_SYMBOLDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 177 , 42 ) ;
         Size = MAP_APPFONT ( 56 , 14 ) ;
@@ -1131,6 +1178,7 @@ ModalDialog RID_SYMBOLDIALOG
 
 ModalDialog RID_SYMDEFINEDIALOG
 {
+    HelpID = "starmath:ModalDialog:RID_SYMDEFINEDIALOG";
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
@@ -1145,6 +1193,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     ComboBox 1
     {
+        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:1";
         Pos = MAP_APPFONT ( 59 , 6 ) ;
         Size = MAP_APPFONT ( 80 , 100 ) ;
         TabStop = TRUE ;
@@ -1160,6 +1209,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     ComboBox 2
     {
+        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:2";
         Pos = MAP_APPFONT ( 210 , 6 ) ;
         Size = MAP_APPFONT ( 80 , 100 ) ;
         TabStop = TRUE ;
@@ -1184,6 +1234,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     ComboBox 4
     {
+        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:4";
         Pos = MAP_APPFONT ( 80 , 115 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
@@ -1199,6 +1250,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     ComboBox 5
     {
+        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:5";
         Pos = MAP_APPFONT ( 80 , 130 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
@@ -1214,6 +1266,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     ListBox 1
     {
+        HelpID = "starmath:ListBox:RID_SYMDEFINEDIALOG:1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 145 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -1230,6 +1283,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     ListBox LB_FONTS_SUBSET
     {
+        HelpID = "starmath:ListBox:RID_SYMDEFINEDIALOG:LB_FONTS_SUBSET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 160 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -1246,6 +1300,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     ComboBox 3
     {
+        HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:3";
         Border = TRUE;
         Pos = MAP_APPFONT ( 80 , 175 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -1312,6 +1367,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     PushButton 1
     {
+        HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:1";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 305 , 195 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -1319,6 +1375,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     PushButton 2
     {
+        HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:2";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 245 , 195 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -1326,6 +1383,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     };
     PushButton 3
     {
+        HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:3";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 185 , 195 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -1397,37 +1455,37 @@ Menu RID_VIEWMENU
         MenuItem
         {
             Identifier = SID_VIEW050 ;
-            HelpID = SID_VIEW050 ;
+            HelpId = CMD_SID_VIEW050 ;
             Text [ en-US ] = "~View 50%" ;
         };
         MenuItem
         {
             Identifier = SID_VIEW100 ;
-            HelpID = SID_VIEW100 ;
+            HelpId = CMD_SID_VIEW100 ;
             Text [ en-US ] = "View ~100%" ;
         };
         MenuItem
         {
             Identifier = SID_VIEW200 ;
-            HelpID = SID_VIEW200 ;
+            HelpId = CMD_SID_VIEW200 ;
             Text [ en-US ] = "View ~200%" ;
         };
         MenuItem
         {
             Identifier = SID_ZOOMIN ;
-            HelpID = SID_ZOOMIN ;
+            HelpId = CMD_SID_ZOOMIN ;
             Text [ en-US ] = "~Zoom In" ;
         };
         MenuItem
         {
             Identifier = SID_ZOOMOUT ;
-            HelpID = SID_ZOOMOUT ;
+            HelpId = CMD_SID_ZOOMOUT ;
             Text [ en-US ] = "Zoom ~Out" ;
         };
         MenuItem
         {
             Identifier = SID_ADJUST ;
-            HelpID = SID_ADJUST ;
+            HelpId = CMD_SID_ADJUST ;
             Text [ en-US ] = "~Display All" ;
         };
         MenuItem
@@ -1437,7 +1495,7 @@ Menu RID_VIEWMENU
         MenuItem
         {
             Identifier = SID_DRAW ;
-            HelpID = SID_DRAW ;
+            HelpId = CMD_SID_DRAW ;
             Text [ en-US ] = "U~pdate" ;
         };
     };
@@ -1685,76 +1743,6 @@ String RID_ERR_RIGHTEXPECTED
     Text [ en-US ] = "'RIGHT' expected" ;
 };
 
-#include "menu.src"
-
-ToolBox RID_MATH_TOOLBOX
-{
-    HelpId = RID_MATH_TOOLBOX ;
-    Customize = TRUE ;
-    LineSpacing = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Scroll = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Align = BOXALIGN_LEFT ;
-    Size = MAP_APPFONT ( 0 , 0 ) ;
-    MenuStrings = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_ZOOMIN ;
-            HelpID = SID_ZOOMIN ;
-            Text [ en-US ] = "Zoom In" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ZOOMOUT ;
-            HelpID = SID_ZOOMOUT ;
-            Text [ en-US ] = "Zoom Out" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_VIEW100 ;
-            HelpID = SID_VIEW100 ;
-            Text [ en-US ] = "Zoom 100%" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ADJUST ;
-            HelpID = SID_ADJUST ;
-            Text [ en-US ] = "Entire Formula" ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_DRAW ;
-            HelpID = SID_DRAW ;
-            Text [ en-US ] = "Refresh" ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_FORMULACURSOR ;
-            HelpID = SID_FORMULACURSOR ;
-            Text [ en-US ] = "Formula Cursor";
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_SYMBOLS_CATALOGUE ;
-            HelpID = SID_SYMBOLS_CATALOGUE ;
-            Text [ en-US ] = "Symbols" ;
-        };
-    };
-};
-
 String RID_MATH_TOOLBOX
 {
     Text [ en-US ] = "Main Toolbar" ;
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index cd3e4b714469..108cb9c69e4a 100755
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -238,7 +238,8 @@ enum SmModelPropertyHandles
     // --> PB 2004-08-25 #i33095# Security Options
     HANDLE_LOAD_READONLY,
     // <--
-    HANDLE_DIALOG_LIBRARIES     // #i73329#
+    HANDLE_DIALOG_LIBRARIES,     // #i73329#
+    HANDLE_BASELINE // 3.7.2010 #i972#
 };
 
 PropertySetInfo * lcl_createModelPropertyInfo ()
@@ -310,6 +311,9 @@ PropertySetInfo * lcl_createModelPropertyInfo ()
         // --> PB 2004-08-25 #i33095# Security Options
         { RTL_CONSTASCII_STRINGPARAM( "LoadReadonly" ), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), PROPERTY_NONE, 0 },
         // <--
+        // --> 3.7.2010 #i972#
+        { RTL_CONSTASCII_STRINGPARAM( "BaseLine"), HANDLE_BASELINE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+        // <--
         { NULL, 0, 0, NULL, 0, 0 }
     };
     PropertySetInfo *pInfo = new PropertySetInfo ( aModelPropertyInfoMap );
@@ -955,6 +959,21 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
                 break;
             }
             // <--
+            // --> 3.7.2010 #i972#
+            case HANDLE_BASELINE:
+            {
+                if ( !pDocSh->pTree )
+                    pDocSh->Parse();
+                if ( pDocSh->pTree )
+                {
+                    if ( !pDocSh->IsFormulaArranged() )
+                        pDocSh->ArrangeFormula();
+
+                    *pValue <<= static_cast<sal_Int32>( pDocSh->pTree->GetFormulaBaseline() );
+                }
+            }
+            break;
+            // <--
         }
     }
 }
diff --git a/starmath/util/hidother.src b/starmath/util/hidother.src
index e55a97852b62..23a4aab1eb76 100644
--- a/starmath/util/hidother.src
+++ b/starmath/util/hidother.src
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include "../inc/starmath.hrc"
+#include "../inc/helpids.h"
 
 hidspecial HID_SMA_OPTIONSDIALOG           { HelpId = HID_SMA_OPTIONSDIALOG; };
 hidspecial HID_SMA_FONTDIALOG              { HelpId = HID_SMA_FONTDIALOG; };
@@ -70,7 +70,6 @@ hidspecial HID_SMA_CREATORSTR              { HelpId = HID_SMA_CREATORSTR; };
 hidspecial HID_SMA_FILESMFTYP              { HelpId = HID_SMA_FILESMFTYP; };
 hidspecial HID_SMA_FILESYMTYP              { HelpId = HID_SMA_FILESYMTYP; };
 hidspecial HID_SMA_WIN_DOCUMENT            { HelpId = HID_SMA_WIN_DOCUMENT; };
-hidspecial HID_SMA_VIEWSHELL_DOCUMENT      { HelpId = HID_SMA_VIEWSHELL_DOCUMENT; };
 hidspecial HID_SMA_COMMAND_WIN_EDIT        { HelpId = HID_SMA_COMMAND_WIN_EDIT; };
 
 hidspecial HID_SMA_DEFAULT_DIST         { HelpId = HID_SMA_DEFAULT_DIST; };
author	sb <sb@openoffice.org>	2010-11-19 11:35:41 +0100
committer	sb <sb@openoffice.org>	2010-11-19 11:35:41 +0100
commit	78a69132580e37c31f62a1ee3caca6cd84f75aad (patch)
tree	93bc1acb98412baf3116097deea545dc62a50ecd /starmath
parent	c659c9cd2c18a6ebd448080559cd404e9672691e (diff)
parent	f1dc19695c083ec5f1356a2c082f2c4feb53aa33 (diff)