untranslated strings are just strings

removes starmaths InsertCommand in favour of InsertCommandText

Change-Id: I5659adcaa28e5b5861d1a1cc5d2afa84009490f6
Reviewed-on: https://gerrit.libreoffice.org/37113
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 284 insertions, 285 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index a7a43a1d11f4..5c16ce50f210 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -75,15 +75,15 @@ class SmElementsControl : public Control
     friend class ElementSelectorUIObject;
     friend class ElementUIObject;
 
-    static const sal_uInt16 aUnaryBinaryOperatorsList[][2];
-    static const sal_uInt16 aRelationsList[][2];
-    static const sal_uInt16 aSetOperations[][2];
-    static const sal_uInt16 aFunctions[][2];
-    static const sal_uInt16 aOperators[][2];
-    static const sal_uInt16 aAttributes[][2];
-    static const sal_uInt16 aBrackets[][2];
-    static const sal_uInt16 aFormats[][2];
-    static const sal_uInt16 aOthers[][2];
+    static const std::pair<const char*, sal_uInt16> aUnaryBinaryOperatorsList[];
+    static const std::pair<const char*, sal_uInt16> aRelationsList[];
+    static const std::pair<const char*, sal_uInt16> aSetOperations[];
+    static const std::pair<const char*, sal_uInt16> aFunctions[];
+    static const std::pair<const char*, sal_uInt16> aOperators[];
+    static const std::pair<const char*, sal_uInt16> aAttributes[];
+    static const std::pair<const char*, sal_uInt16> aBrackets[];
+    static const std::pair<const char*, sal_uInt16> aFormats[];
+    static const std::pair<const char*, sal_uInt16> aOthers[];
 
     virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
     virtual void MouseButtonDown(const MouseEvent& rMEvt) override;
@@ -103,7 +103,7 @@ class SmElementsControl : public Control
 
     void addElement(const OUString& aElementVisual, const OUString& aElementSource, const OUString& aHelpText);
 
-    void addElements(const sal_uInt16 aElementsArray[][2], sal_uInt16 size);
+    void addElements(const std::pair<const char*, sal_uInt16> aElementsArray[], sal_uInt16 size);
 
     void build();
 
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index c499b2a1de7d..f35011a31c42 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -106,9 +106,6 @@ public:
     /** Insert an element into the formula */
     void InsertElement(SmFormulaElement element);
 
-    /** Insert a command specified in commands.src*/
-    void InsertCommand(sal_uInt16 nCommand);
-
     /** Insert command text translated into line entries at position
      *
      * Note: This method uses the parser to translate a command text into a
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 6f1aa1ae7f15..2dea051045ed 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -110,7 +110,6 @@ public:
     void Delete();
     void SelectAll();
     void InsertText(const OUString& rText);
-    void InsertCommand(sal_uInt16 nCommand);
     void MarkError(const Point &rPos);
     void SelNextMark();
     void SelPrevMark();
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 7ee87be44222..5ec6852f5ef8 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -47,8 +47,7 @@
 #define SID_GAPHIC_SM               (SID_SMA_START + 101)
 /** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */
 #define SID_INSERTSYMBOL            (SID_SMA_START + 104)
-/** Command for inserting a math construction specified in commands.src */
-#define SID_INSERTCOMMAND           (SID_SMA_START + 105)
+/** Command for inserting a math construction */
 #define SID_INSERTCOMMANDTEXT       (SID_SMA_START + 106)
 
 #define SID_LOADSYMBOLS             (SID_SMA_START + 107)
@@ -85,7 +84,6 @@
 
 #define RID_MATH_TOOLBOX            (RID_APP_START + 50)
 
-#define RID_UNDOFORMATNAME          (RID_APP_START + 504)
 #define RID_FONTREGULAR             (RID_APP_START + 804)
 #define RID_FONTITALIC              (RID_APP_START + 805)
 #define RID_FONTBOLD                (RID_APP_START + 806)
@@ -135,68 +133,6 @@
 // blank: 934 - 935
 #define RID_ERR_RIGHTEXPECTED       (RID_APP_START + 936)
 
-// new resource ID's
-#define RID_PLUSX                   (RID_APP_START + 1201)
-#define RID_MINUSX                  (RID_APP_START + 1202)
-#define RID_PLUSMINUSX              (RID_APP_START + 1203)
-#define RID_MINUSPLUSX              (RID_APP_START + 1204)
-#define RID_XPLUSY                  (RID_APP_START + 1205)
-#define RID_XCDOTY                  (RID_APP_START + 1206)
-#define RID_XTIMESY                 (RID_APP_START + 1207)
-#define RID_XSYMTIMESY              (RID_APP_START + 1208)
-#define RID_XMINUSY                 (RID_APP_START + 1209)
-#define RID_XOVERY                  (RID_APP_START + 1210)
-#define RID_XDIVY                   (RID_APP_START + 1211)
-#define RID_XSYMDIVIDEY             (RID_APP_START + 1212)
-#define RID_NEGX                    (RID_APP_START + 1213)
-#define RID_XANDY                   (RID_APP_START + 1214)
-#define RID_XORY                    (RID_APP_START + 1215)
-#define RID_XODIVIDEY               (RID_APP_START + 1216)
-#define RID_XODOTY                  (RID_APP_START + 1217)
-#define RID_XOMINUSY                (RID_APP_START + 1218)
-#define RID_XOPLUSY                 (RID_APP_START + 1219)
-#define RID_XOTIMESY                (RID_APP_START + 1220)
-#define RID_XCIRCY                  (RID_APP_START + 1221)
-#define RID_XWIDESLASHY             (RID_APP_START + 1222)
-#define RID_XWIDEBSLASHY            (RID_APP_START + 1223)
-
-#define RID_XEQY                    (RID_APP_START + 1301)
-#define RID_XNEQY                   (RID_APP_START + 1302)
-#define RID_XEQUIVY                 (RID_APP_START + 1303)
-#define RID_XORTHOY                 (RID_APP_START + 1304)
-#define RID_XLTY                    (RID_APP_START + 1305)
-#define RID_XGTY                    (RID_APP_START + 1306)
-#define RID_XAPPROXY                (RID_APP_START + 1307)
-#define RID_XPARALLELY              (RID_APP_START + 1308)
-#define RID_XLESLANTY               (RID_APP_START + 1309)
-#define RID_XGESLANTY               (RID_APP_START + 1310)
-#define RID_XSIMEQY                 (RID_APP_START + 1311)
-#define RID_XPROPY                  (RID_APP_START + 1312)
-#define RID_XLEY                    (RID_APP_START + 1313)
-#define RID_XGEY                    (RID_APP_START + 1314)
-#define RID_XSIMY                   (RID_APP_START + 1315)
-#define RID_XTOWARDY                (RID_APP_START + 1316)
-#define RID_XLLY                    (RID_APP_START + 1317)
-#define RID_XGGY                    (RID_APP_START + 1318)
-#define RID_XDEFY                   (RID_APP_START + 1319)
-#define RID_XTRANSLY                (RID_APP_START + 1320)
-#define RID_XTRANSRY                (RID_APP_START + 1321)
-#define RID_XDIVIDESY               (RID_APP_START + 1322)
-#define RID_XNDIVIDESY              (RID_APP_START + 1323)
-#define RID_DLARROW                 (RID_APP_START + 1324)
-#define RID_DLRARROW                (RID_APP_START + 1325)
-#define RID_DRARROW                 (RID_APP_START + 1326)
-
-// Game theory
-#define RID_XPRECEDESY              (RID_APP_START + 1327)
-#define RID_XNOTPRECEDESY           (RID_APP_START + 1328)
-#define RID_XSUCCEEDSY              (RID_APP_START + 1329)
-#define RID_XNOTSUCCEEDSY           (RID_APP_START + 1330)
-#define RID_XPRECEDESEQUALY         (RID_APP_START + 1331)
-#define RID_XSUCCEEDSEQUALY         (RID_APP_START + 1332)
-#define RID_XPRECEDESEQUIVY         (RID_APP_START + 1333)
-#define RID_XSUCCEEDSEQUIVY         (RID_APP_START + 1334)
-
 // Help text
 #define RID_PLUSX_HELP              (RID_APP_START + 1335)
 #define RID_MINUSX_HELP             (RID_APP_START + 1336)
@@ -256,211 +192,6 @@
 #define RID_NOTEXISTS_HELP          (RID_APP_START + 1399)
 #define RID_FORALL_HELP             (RID_APP_START + 1400)
 
-#define RID_XINY                    (RID_APP_START + 1401)
-#define RID_XNOTINY                 (RID_APP_START + 1402)
-#define RID_XOWNSY                  (RID_APP_START + 1403)
-#define RID_XINTERSECTIONY          (RID_APP_START + 1405)
-#define RID_XUNIONY                 (RID_APP_START + 1406)
-#define RID_XSETMINUSY              (RID_APP_START + 1407)
-#define RID_XSLASHY                 (RID_APP_START + 1408)
-#define RID_XSUBSETY                (RID_APP_START + 1409)
-#define RID_XSUBSETEQY              (RID_APP_START + 1410)
-#define RID_XSUPSETY                (RID_APP_START + 1411)
-#define RID_XSUPSETEQY              (RID_APP_START + 1412)
-#define RID_XNSUBSETY               (RID_APP_START + 1413)
-#define RID_XNSUBSETEQY             (RID_APP_START + 1414)
-#define RID_XNSUPSETY               (RID_APP_START + 1415)
-#define RID_XNSUPSETEQY             (RID_APP_START + 1416)
-#define RID_SETN                    (RID_APP_START + 1417)
-#define RID_SETZ                    (RID_APP_START + 1418)
-#define RID_SETQ                    (RID_APP_START + 1419)
-#define RID_SETR                    (RID_APP_START + 1420)
-#define RID_SETC                    (RID_APP_START + 1421)
-
-#define RID_ABSX                    (RID_APP_START + 1501)
-#define RID_FACTX                   (RID_APP_START + 1502)
-#define RID_SQRTX                   (RID_APP_START + 1503)
-#define RID_NROOTXY                 (RID_APP_START + 1504)
-#define RID_EX                      (RID_APP_START + 1505)
-#define RID_LNX                     (RID_APP_START + 1506)
-#define RID_EXPX                    (RID_APP_START + 1507)
-#define RID_LOGX                    (RID_APP_START + 1508)
-#define RID_SINX                    (RID_APP_START + 1509)
-#define RID_COSX                    (RID_APP_START + 1510)
-#define RID_TANX                    (RID_APP_START + 1511)
-#define RID_COTX                    (RID_APP_START + 1512)
-#define RID_SINHX                   (RID_APP_START + 1513)
-#define RID_COSHX                   (RID_APP_START + 1514)
-#define RID_TANHX                   (RID_APP_START + 1515)
-#define RID_COTHX                   (RID_APP_START + 1516)
-#define RID_ARCSINX                 (RID_APP_START + 1517)
-#define RID_ARCCOSX                 (RID_APP_START + 1518)
-#define RID_ARCTANX                 (RID_APP_START + 1519)
-#define RID_ARCCOTX                 (RID_APP_START + 1520)
-#define RID_ARSINHX                 (RID_APP_START + 1521)
-#define RID_ARCOSHX                 (RID_APP_START + 1522)
-#define RID_ARTANHX                 (RID_APP_START + 1523)
-#define RID_ARCOTHX                 (RID_APP_START + 1524)
-
-#define RID_LIMX                    (RID_APP_START + 1601)
-#define RID_SUMX                    (RID_APP_START + 1602)
-#define RID_PRODX                   (RID_APP_START + 1603)
-#define RID_COPRODX                 (RID_APP_START + 1604)
-#define RID_INTX                    (RID_APP_START + 1605)
-#define RID_IINTX                   (RID_APP_START + 1606)
-#define RID_IIINTX                  (RID_APP_START + 1607)
-#define RID_LINTX                   (RID_APP_START + 1609)
-#define RID_LLINTX                  (RID_APP_START + 1610)
-#define RID_LLLINTX                 (RID_APP_START + 1611)
-#define RID_FROMXTOY                (RID_APP_START + 1613)
-#define RID_FROMX                   (RID_APP_START + 1614)
-#define RID_TOX                     (RID_APP_START + 1615)
-#define RID_LIMINFX                 (RID_APP_START + 1616)
-#define RID_LIMSUPX                 (RID_APP_START + 1617)
-
-#define RID_LIM_FROMX               (RID_APP_START + 1621)
-#define RID_SUM_FROMX               (RID_APP_START + 1622)
-#define RID_PROD_FROMX              (RID_APP_START + 1623)
-#define RID_COPROD_FROMX            (RID_APP_START + 1624)
-#define RID_INT_FROMX               (RID_APP_START + 1625)
-#define RID_IINT_FROMX              (RID_APP_START + 1626)
-#define RID_IIINT_FROMX             (RID_APP_START + 1627)
-#define RID_LINT_FROMX              (RID_APP_START + 1629)
-#define RID_LLINT_FROMX             (RID_APP_START + 1630)
-#define RID_LLLINT_FROMX            (RID_APP_START + 1631)
-#define RID_LIMINF_FROMX            (RID_APP_START + 1632)
-#define RID_LIMSUP_FROMX            (RID_APP_START + 1633)
-
-#define RID_LIM_TOX                 (RID_APP_START + 1641)
-#define RID_SUM_TOX                 (RID_APP_START + 1642)
-#define RID_PROD_TOX                (RID_APP_START + 1643)
-#define RID_COPROD_TOX              (RID_APP_START + 1644)
-#define RID_INT_TOX                 (RID_APP_START + 1645)
-#define RID_IINT_TOX                (RID_APP_START + 1646)
-#define RID_IIINT_TOX               (RID_APP_START + 1647)
-#define RID_LINT_TOX                (RID_APP_START + 1649)
-#define RID_LLINT_TOX               (RID_APP_START + 1650)
-#define RID_LLLINT_TOX              (RID_APP_START + 1651)
-#define RID_LIMINF_TOX              (RID_APP_START + 1652)
-#define RID_LIMSUP_TOX              (RID_APP_START + 1653)
-
-#define RID_LIM_FROMTOX             (RID_APP_START + 1661)
-#define RID_SUM_FROMTOX             (RID_APP_START + 1662)
-#define RID_PROD_FROMTOX            (RID_APP_START + 1663)
-#define RID_COPROD_FROMTOX          (RID_APP_START + 1664)
-#define RID_INT_FROMTOX             (RID_APP_START + 1665)
-#define RID_IINT_FROMTOX            (RID_APP_START + 1666)
-#define RID_IIINT_FROMTOX           (RID_APP_START + 1667)
-#define RID_LINT_FROMTOX            (RID_APP_START + 1669)
-#define RID_LLINT_FROMTOX           (RID_APP_START + 1670)
-#define RID_LLLINT_FROMTOX          (RID_APP_START + 1671)
-#define RID_LIMINF_FROMTOX          (RID_APP_START + 1672)
-#define RID_LIMSUP_FROMTOX          (RID_APP_START + 1673)
-
-#define RID_ACUTEX                  (RID_APP_START + 1701)
-#define RID_GRAVEX                  (RID_APP_START + 1702)
-#define RID_CHECKX                  (RID_APP_START + 1703)
-#define RID_BREVEX                  (RID_APP_START + 1704)
-#define RID_BARX                    (RID_APP_START + 1705)
-#define RID_VECX                    (RID_APP_START + 1706)
-#define RID_HATX                    (RID_APP_START + 1707)
-#define RID_TILDEX                  (RID_APP_START + 1708)
-#define RID_CIRCLEX                 (RID_APP_START + 1709)
-#define RID_DOTX                    (RID_APP_START + 1710)
-#define RID_DDOTX                   (RID_APP_START + 1711)
-#define RID_DDDOTX                  (RID_APP_START + 1712)
-#define RID_OVERLINEX               (RID_APP_START + 1713)
-#define RID_UNDERLINEX              (RID_APP_START + 1714)
-#define RID_OVERSTRIKEX             (RID_APP_START + 1715)
-#define RID_PHANTOMX                (RID_APP_START + 1716)
-#define RID_BOLDX                   (RID_APP_START + 1717)
-#define RID_ITALX                   (RID_APP_START + 1718)
-#define RID_SIZEXY                  (RID_APP_START + 1719)
-#define RID_FONTXY                  (RID_APP_START + 1720)
-#define RID_WIDEHATX                (RID_APP_START + 1722)
-#define RID_WIDETILDEX              (RID_APP_START + 1723)
-#define RID_WIDEVECX                (RID_APP_START + 1724)
-#define RID_COLORX_BLACK            (RID_APP_START + 1725)
-#define RID_COLORX_BLUE             (RID_APP_START + 1726)
-#define RID_COLORX_GREEN            (RID_APP_START + 1727)
-#define RID_COLORX_RED              (RID_APP_START + 1728)
-#define RID_COLORX_CYAN             (RID_APP_START + 1729)
-#define RID_COLORX_MAGENTA          (RID_APP_START + 1730)
-#define RID_COLORX_YELLOW           (RID_APP_START + 1731)
-#define RID_COLORX_GRAY             (RID_APP_START + 1734)
-#define RID_COLORX_LIME             (RID_APP_START + 1735)
-#define RID_COLORX_MAROON           (RID_APP_START + 1736)
-#define RID_COLORX_NAVY             (RID_APP_START + 1737)
-#define RID_COLORX_OLIVE            (RID_APP_START + 1738)
-#define RID_COLORX_PURPLE           (RID_APP_START + 1739)
-#define RID_COLORX_SILVER           (RID_APP_START + 1740)
-#define RID_COLORX_TEAL             (RID_APP_START + 1741)
-
-#define RID_LRPARENTX               (RID_APP_START + 1801)
-#define RID_LRBRACKETX              (RID_APP_START + 1802)
-#define RID_LRANGLEX                (RID_APP_START + 1803)
-#define RID_LRBRACEX                (RID_APP_START + 1804)
-#define RID_LRLINEX                 (RID_APP_START + 1805)
-#define RID_LRDLINEX                (RID_APP_START + 1806)
-#define RID_LRGROUPX                (RID_APP_START + 1808)
-#define RID_SLRPARENTX              (RID_APP_START + 1809)
-#define RID_SLRBRACKETX             (RID_APP_START + 1810)
-#define RID_SLRANGLEX               (RID_APP_START + 1811)
-#define RID_SLRBRACEX               (RID_APP_START + 1812)
-#define RID_SLRLINEX                (RID_APP_START + 1813)
-#define RID_SLRDLINEX               (RID_APP_START + 1814)
-#define RID_LRCEILX                 (RID_APP_START + 1817)
-#define RID_LRFLOORX                (RID_APP_START + 1818)
-#define RID_SLRCEILX                (RID_APP_START + 1819)
-#define RID_SLRFLOORX               (RID_APP_START + 1820)
-#define RID_LMRANGLEXY              (RID_APP_START + 1821)
-#define RID_SLMRANGLEXY             (RID_APP_START + 1822)
-#define RID_LRDBRACKETX             (RID_APP_START + 1823)
-#define RID_SLRDBRACKETX            (RID_APP_START + 1824)
-#define RID_XOVERBRACEY             (RID_APP_START + 1825)
-#define RID_XUNDERBRACEY            (RID_APP_START + 1826)
-#define RID_XEVALUATEDATY           (RID_APP_START + 1827)
-
-#define RID_NEWLINE                 (RID_APP_START + 1901)
-#define RID_SBLANK                  (RID_APP_START + 1902)
-#define RID_BLANK                   (RID_APP_START + 1903)
-#define RID_RSUBX                   (RID_APP_START + 1904)
-#define RID_BINOMXY                 (RID_APP_START + 1905)
-#define RID_STACK                   (RID_APP_START + 1906)
-#define RID_MATRIX                  (RID_APP_START + 1907)
-#define RID_RSUPX                   (RID_APP_START + 1908)
-#define RID_ALIGNLX                 (RID_APP_START + 1909)
-#define RID_ALIGNCX                 (RID_APP_START + 1910)
-#define RID_ALIGNRX                 (RID_APP_START + 1911)
-#define RID_LSUBX                   (RID_APP_START + 1912)
-#define RID_LSUPX                   (RID_APP_START + 1916)
-#define RID_CSUBX                   (RID_APP_START + 1917)
-#define RID_CSUPX                   (RID_APP_START + 1918)
-#define RID_NOSPACE                 (RID_APP_START + 1919)
-
-#define RID_ALEPH                   (RID_APP_START + 2001)
-#define RID_EMPTYSET                (RID_APP_START + 2002)
-#define RID_RE                      (RID_APP_START + 2003)
-#define RID_IM                      (RID_APP_START + 2004)
-#define RID_INFINITY                (RID_APP_START + 2005)
-#define RID_PARTIAL                 (RID_APP_START + 2006)
-#define RID_WP                      (RID_APP_START + 2007)
-#define RID_DOTSAXIS                (RID_APP_START + 2008)
-#define RID_DOTSUP                  (RID_APP_START + 2009)
-#define RID_DOTSDOWN                (RID_APP_START + 2010)
-#define RID_DOTSLOW                 (RID_APP_START + 2011)
-#define RID_DOTSVERT                (RID_APP_START + 2012)
-#define RID_NABLA                   (RID_APP_START + 2013)
-#define RID_HBAR                    (RID_APP_START + 2014)
-#define RID_LAMBDABAR               (RID_APP_START + 2015)
-#define RID_LEFTARROW               (RID_APP_START + 2016)
-#define RID_RIGHTARROW              (RID_APP_START + 2017)
-#define RID_UPARROW                 (RID_APP_START + 2018)
-#define RID_DOWNARROW               (RID_APP_START + 2019)
-#define RID_EXISTS                  (RID_APP_START + 1608)
-#define RID_NOTEXISTS               (RID_APP_START + 1618)
-#define RID_FORALL                  (RID_APP_START + 1612)
-
 #define RID_UI_SYMBOL_NAMES             (RID_APP_START + 3102)
 #define RID_EXPORT_SYMBOL_NAMES         (RID_APP_START + 3103)
 #define RID_UI_SYMBOLSET_NAMES          (RID_APP_START + 3105)
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
new file mode 100644
index 000000000000..477671bcba6c
--- /dev/null
+++ b/starmath/inc/strings.hxx
@@ -0,0 +1,272 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_STARMATH_INC_STRINGS_HXX
+#define INCLUDED_STARMATH_INC_STRINGS_HXX
+
+#define RID_UNDOFORMATNAME  "Format"
+
+#define RID_PLUSX           "+<?> "
+#define RID_MINUSX          "-<?> "
+#define RID_PLUSMINUSX      "+-<?> "
+#define RID_MINUSPLUSX      "-+<?> "
+#define RID_NEGX            "neg <?> "
+#define RID_XPLUSY          "<?> + <?> "
+#define RID_XMINUSY         "<?> - <?> "
+#define RID_XCDOTY          "<?> cdot <?> "
+#define RID_XTIMESY         "<?> times <?> "
+#define RID_XSYMTIMESY      "<?> * <?> "
+#define RID_XSYMDIVIDEY     "<?> / <?> "
+#define RID_XDIVY           "<?> div <?> "
+#define RID_XOVERY          "{<?>} over {<?>} "
+#define RID_XODIVIDEY       "<?> odivide <?> "
+#define RID_XODOTY          "<?> odot <?> "
+#define RID_XOMINUSY        "<?> ominus <?> "
+#define RID_XOPLUSY         "<?> oplus <?> "
+#define RID_XOTIMESY        "<?> otimes <?> "
+#define RID_XANDY           "<?> and <?> "
+#define RID_XORY            "<?> or <?> "
+#define RID_XEQY            "<?> = <?> "
+#define RID_XNEQY           "<?> <> <?> "
+#define RID_XLTY            "<?> < <?> "
+#define RID_XGTY            "<?> > <?> "
+#define RID_XLEY            "<?> <= <?> "
+#define RID_XGEY            "<?> >= <?> "
+#define RID_XLESLANTY       "<?> leslant <?> "
+#define RID_XGESLANTY       "<?> geslant <?> "
+#define RID_XLLY            "<?> << <?> "
+#define RID_XGGY            "<?> >> <?> "
+#define RID_XDEFY           "<?> def <?> "
+#define RID_XEQUIVY         "<?> equiv <?> "
+#define RID_XAPPROXY        "<?> approx <?> "
+#define RID_XSIMY           "<?> sim <?> "
+#define RID_XSIMEQY         "<?> simeq <?> "
+#define RID_XPROPY          "<?> prop <?> "
+#define RID_XORTHOY         "<?> ortho <?> "
+#define RID_XPARALLELY      "<?> parallel <?> "
+#define RID_XTOWARDY        "<?> toward <?> "
+#define RID_XTRANSLY        "<?> transl <?> "
+#define RID_XTRANSRY        "<?> transr <?> "
+#define RID_XINY            "<?> in <?> "
+#define RID_XNOTINY         "<?> notin <?> "
+#define RID_XOWNSY          "<?> owns <?> "
+#define RID_XUNIONY         "<?> union <?> "
+#define RID_XINTERSECTIONY  "<?> intersection <?> "
+#define RID_XSETMINUSY      "<?> setminus <?> "
+#define RID_XSLASHY         "<?> slash <?> "
+#define RID_XSUBSETY        "<?> subset <?> "
+#define RID_XSUBSETEQY      "<?> subseteq <?> "
+#define RID_XSUPSETY        "<?> supset <?> "
+#define RID_XSUPSETEQY      "<?> supseteq <?> "
+#define RID_XNSUBSETY       "<?> nsubset <?> "
+#define RID_XNSUBSETEQY     "<?> nsubseteq <?> "
+#define RID_XNSUPSETY       "<?> nsupset <?> "
+#define RID_XNSUPSETEQY     "<?> nsupseteq <?> "
+#define RID_ABSX            "abs{<?>} "
+#define RID_FACTX           "fact{<?>} "
+#define RID_SQRTX           "sqrt{<?>} "
+#define RID_NROOTXY         "nroot{<?>}{<?>} "
+#define RID_EX              "func e^{<?>} "
+#define RID_EXPX            "exp(<?>) "
+#define RID_LNX             "ln(<?>) "
+#define RID_LOGX            "log(<?>) "
+#define RID_SINX            "sin(<?>) "
+#define RID_COSX            "cos(<?>) "
+#define RID_TANX            "tan(<?>) "
+#define RID_COTX            "cot(<?>) "
+#define RID_ARCSINX         "arcsin(<?>) "
+#define RID_ARCCOSX         "arccos(<?>) "
+#define RID_ARCTANX         "arctan(<?>) "
+#define RID_ARCCOTX         "arccot(<?>) "
+#define RID_SINHX           "sinh(<?>) "
+#define RID_COSHX           "cosh(<?>) "
+#define RID_TANHX           "tanh(<?>) "
+#define RID_COTHX           "coth(<?>) "
+#define RID_ARSINHX         "arsinh(<?>) "
+#define RID_ARCOSHX         "arcosh(<?>) "
+#define RID_ARTANHX         "artanh(<?>) "
+#define RID_ARCOTHX         "arcoth(<?>) "
+#define RID_SUMX            "sum <?> "
+#define RID_SUM_FROMX       "sum from{<?>} <?> "
+#define RID_SUM_TOX         "sum to{<?>} <?> "
+#define RID_SUM_FROMTOX     "sum from{<?>} to{<?>} <?> "
+#define RID_PRODX           "prod <?> "
+#define RID_PROD_FROMX      "prod from{<?>} <?> "
+#define RID_PROD_TOX        "prod to{<?>} <?> "
+#define RID_PROD_FROMTOX    "prod from{<?>} to{<?>} <?> "
+#define RID_COPRODX         "coprod <?> "
+#define RID_COPROD_FROMX    "coprod from{<?>} <?> "
+#define RID_COPROD_TOX      "coprod to{<?>} <?> "
+#define RID_COPROD_FROMTOX  "coprod from{<?>} to{<?>} <?> "
+#define RID_LIMX            "lim <?> "
+#define RID_LIM_FROMX       "lim from{<?>} <?> "
+#define RID_LIM_TOX         "lim to{<?>} <?> "
+#define RID_LIM_FROMTOX     "lim from{<?>} to{<?>} <?> "
+#define RID_LIMINFX         "liminf <?> "
+#define RID_LIMINF_FROMX    "liminf from{<?>} <?> "
+#define RID_LIMINF_TOX      "liminf to{<?>} <?> "
+#define RID_LIMINF_FROMTOX  "liminf from{<?>} to{<?>} <?> "
+#define RID_LIMSUPX         "limsup <?> "
+#define RID_LIMSUP_FROMX    "limsup from{<?>} <?> "
+#define RID_LIMSUP_TOX      "limsup to{<?>} <?> "
+#define RID_LIMSUP_FROMTOX  "limsup from{<?>} to{<?>} <?> "
+#define RID_EXISTS          "exists "
+#define RID_NOTEXISTS       "notexists "
+#define RID_FORALL          "forall "
+#define RID_INTX            "int <?> "
+#define RID_INT_FROMX       "int from{<?>} <?> "
+#define RID_INT_TOX         "int to{<?>} <?> "
+#define RID_INT_FROMTOX     "int from{<?>} to{<?>} <?> "
+#define RID_IINTX           "iint <?> "
+#define RID_IINT_FROMX      "iint from{<?>} <?> "
+#define RID_IINT_TOX        "iint to{<?>} <?> "
+#define RID_IINT_FROMTOX    "iint from{<?>} to{<?>} <?> "
+#define RID_IIINTX          "iiint <?> "
+#define RID_IIINT_FROMX     "iiint from{<?>} <?> "
+#define RID_IIINT_TOX       "iiint to{<?>} <?> "
+#define RID_IIINT_FROMTOX   "iiint from{<?>} to{<?>} <?> "
+#define RID_LINTX           "lint <?> "
+#define RID_LINT_FROMX      "lint from{<?>} <?> "
+#define RID_LINT_TOX        "lint to{<?>} <?> "
+#define RID_LINT_FROMTOX    "lint from{<?>} to{<?>} <?> "
+#define RID_LLINTX          "llint <?> "
+#define RID_LLINT_FROMX     "llint from{<?>} <?> "
+#define RID_LLINT_TOX       "llint to{<?>} <?> "
+#define RID_LLINT_FROMTOX   "llint from{<?>} to{<?>} <?> "
+#define RID_LLLINTX         "lllint <?> "
+#define RID_LLLINT_FROMX    "lllint from{<?>} <?> "
+#define RID_LLLINT_TOX      "lllint to{<?>} <?> "
+#define RID_LLLINT_FROMTOX  "lllint from{<?>} to{<?>} <?> "
+#define RID_FROMX           "from{<?>} <?> "
+#define RID_TOX             "to{<?>} <?> "
+#define RID_FROMXTOY        "from{<?>} to{<?>} <?> "
+#define RID_ACUTEX          "acute <?> "
+#define RID_BARX            "bar <?> "
+#define RID_BREVEX          "breve <?> "
+#define RID_CHECKX          "check <?> "
+#define RID_CIRCLEX         "circle <?> "
+#define RID_DOTX            "dot <?> "
+#define RID_DDOTX           "ddot <?> "
+#define RID_DDDOTX          "dddot <?> "
+#define RID_GRAVEX          "grave <?> "
+#define RID_HATX            "hat <?> "
+#define RID_TILDEX          "tilde <?> "
+#define RID_VECX            "vec <?> "
+#define RID_UNDERLINEX      "underline {<?>} "
+#define RID_OVERLINEX       "overline {<?>} "
+#define RID_OVERSTRIKEX     "overstrike {<?>} "
+#define RID_PHANTOMX        "phantom {<?>} "
+#define RID_BOLDX           "bold <?> "
+#define RID_ITALX           "ital <?> "
+#define RID_SIZEXY          "size <?> {<?>} "
+#define RID_FONTXY          "font <?> {<?>} "
+#define RID_COLORX_BLACK    "color black {<?>} "
+#define RID_COLORX_BLUE     "color blue {<?>} "
+#define RID_COLORX_GREEN    "color green {<?>} "
+#define RID_COLORX_RED      "color red {<?>} "
+#define RID_COLORX_CYAN     "color cyan {<?>} "
+#define RID_COLORX_MAGENTA  "color magenta {<?>} "
+#define RID_COLORX_GRAY     "color gray {<?>} "
+#define RID_COLORX_LIME     "color lime {<?>} "
+#define RID_COLORX_MAROON   "color maroon {<?>} "
+#define RID_COLORX_NAVY     "color navy {<?>} "
+#define RID_COLORX_OLIVE    "color olive {<?>} "
+#define RID_COLORX_PURPLE   "color purple {<?>} "
+#define RID_COLORX_SILVER   "color silver {<?>} "
+#define RID_COLORX_TEAL     "color teal {<?>} "
+#define RID_COLORX_YELLOW   "color yellow {<?>} "
+#define RID_LRGROUPX        "{<?>} "
+#define RID_LRPARENTX       "(<?>) "
+#define RID_LRBRACKETX      "[<?>] "
+#define RID_LRDBRACKETX     "ldbracket <?> rdbracket "
+#define RID_LRBRACEX        "lbrace <?> rbrace "
+#define RID_LRANGLEX        "langle <?> rangle "
+#define RID_LRCEILX         "lceil <?> rceil "
+#define RID_LRFLOORX        "lfloor <?> rfloor "
+#define RID_LRLINEX         "lline <?> rline "
+#define RID_LRDLINEX        "ldline <?> rdline "
+#define RID_LMRANGLEXY      "langle <?> mline <?> rangle "
+#define RID_SLRPARENTX      "left ( <?> right ) "
+#define RID_SLRBRACKETX     "left [ <?> right ] "
+#define RID_SLRDBRACKETX    "left ldbracket <?> right rdbracket "
+#define RID_SLRBRACEX       "left lbrace <?> right rbrace "
+#define RID_SLRANGLEX       "left langle <?> right rangle "
+#define RID_SLRCEILX        "left lceil <?> right rceil "
+#define RID_SLRFLOORX       "left lfloor <?> right rfloor "
+#define RID_SLRLINEX        "left lline <?> right rline "
+#define RID_SLRDLINEX       "left ldline <?> right rdline "
+#define RID_SLMRANGLEXY     "left langle <?> mline <?> right rangle "
+#define RID_XEVALUATEDATY   "left none {<?>} right rline_{<?>} "
+#define RID_XOVERBRACEY     "{<?>} overbrace {<?>} "
+#define RID_XUNDERBRACEY    "{<?>} underbrace {<?>} "
+#define RID_RSUBX           "<?>_{<?>}"
+#define RID_RSUPX           "<?>^{<?>}"
+#define RID_LSUBX           "<?> lsub{<?>} "
+#define RID_LSUPX           "<?> lsup{<?>} "
+#define RID_CSUBX           "<?> csub{<?>} "
+#define RID_CSUPX           "<?> csup{<?>} "
+#define RID_SBLANK          "`"
+#define RID_BLANK           "~"
+#define RID_NEWLINE         "newline "
+#define RID_BINOMXY         "binom{<?>}{<?>} "
+#define RID_STACK           "stack{<?> # <?> # <?>} "
+#define RID_MATRIX          "matrix{<?> # <?> ## <?> # <?>} "
+#define RID_ALIGNLX         "alignl <?> "
+#define RID_ALIGNCX         "alignc <?> "
+#define RID_ALIGNRX         "alignr <?> "
+#define RID_ALEPH           "aleph "
+#define RID_EMPTYSET        "emptyset "
+#define RID_RE              "Re "
+#define RID_IM              "Im "
+#define RID_INFINITY        "infinity "
+#define RID_PARTIAL         "partial "
+#define RID_NABLA           "nabla "
+#define RID_WP              "wp "
+#define RID_DOTSAXIS        "dotsaxis "
+#define RID_DOTSUP          "dotsup "
+#define RID_DOTSDOWN        "dotsdown "
+#define RID_DOTSLOW         "dotslow "
+#define RID_DOTSVERT        "dotsvert "
+#define RID_XCIRCY          "<?> circ <?> "
+#define RID_XWIDESLASHY     "{<?>} wideslash {<?>} "
+#define RID_XWIDEBSLASHY    "{<?>} widebslash {<?>} "
+#define RID_XDIVIDESY       "<?> divides <?> "
+#define RID_XNDIVIDESY      "<?> ndivides <?> "
+#define RID_DLARROW         "<?> dlarrow <?> "
+#define RID_DLRARROW        "<?> dlrarrow <?> "
+#define RID_DRARROW         "<?> drarrow <?> "
+#define RID_SETN            "setN "
+#define RID_SETZ            "setZ "
+#define RID_SETQ            "setQ "
+#define RID_SETR            "setR "
+#define RID_SETC            "setC "
+#define RID_WIDEHATX        "widehat {<?>} "
+#define RID_WIDETILDEX      "widetilde {<?>} "
+#define RID_WIDEVECX        "widevec {<?>} "
+#define RID_HBAR            "hbar "
+#define RID_LAMBDABAR       "lambdabar "
+#define RID_LEFTARROW       "leftarrow "
+#define RID_RIGHTARROW      "rightarrow "
+#define RID_UPARROW         "uparrow "
+#define RID_DOWNARROW       "downarrow "
+#define RID_NOSPACE         "nospace {<?>} "
+#define RID_XPRECEDESY      "<?> prec <?> "
+#define RID_XPRECEDESEQUALY "<?> preccurlyeq <?> "
+#define RID_XPRECEDESEQUIVY "<?> precsim <?> "
+#define RID_XSUCCEEDSY      "<?> succ <?> "
+#define RID_XSUCCEEDSEQUALY "<?> succcurlyeq <?> "
+#define RID_XSUCCEEDSEQUIVY "<?> succsim <?> "
+#define RID_XNOTPRECEDESY   "<?> nprec <?> "
+#define RID_XNOTSUCCEEDSY   "<?> nsucc <?> "
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index fdbe2526e625..83fcf3db07bc 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -229,7 +229,7 @@ class SmViewShell: public SfxViewShell
     DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void );
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
-    /** Used to determine whether insertions using SID_INSERTSYMBOL and SID_INSERTCOMMAND
+    /** Used to determine whether insertions using SID_INSERTSYMBOL and SID_INSERTCOMMANDTEXT
      * should be inserted into SmEditWindow or directly into the SmDocShell as done if the
      * visual editor was last to have focus.
      */