de-duplicate some defines in hrc files

and rename SID_INSERTSYMBOL -> SID_INSERTSPECIAL in starmath to make it
unique

Change-Id: I0eeefe25e0e9374871c73793a31cb3e6cc445f73
Reviewed-on: https://gerrit.libreoffice.org/47369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 8 insertions, 8 deletions

diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index bbe606badee7..6f07991c54b5 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -45,7 +45,7 @@
 #define SID_TEXT                    (SID_SMA_START + 100)
 #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)
+#define SID_INSERTSPECIAL           (SID_SMA_START + 104)
 /** Command for inserting a math construction */
 #define SID_INSERTCOMMANDTEXT       (SID_SMA_START + 106)
 
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index ceecb0718ed2..e530b47d839f 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -223,7 +223,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_INSERTCOMMANDTEXT
+    /** Used to determine whether insertions using SID_INSERTSPECIAL and SID_INSERTCOMMANDTEXT
      * should be inserted into SmEditWindow or directly into the SmDocShell as done if the
      * visual editor was last to have focus.
      */
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index 0ee7306938ca..575e464fa944 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -235,7 +235,7 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
 ]
 
 
-SfxVoidItem InsertConfigName SID_INSERTSYMBOL
+SfxVoidItem InsertConfigName SID_INSERTSPECIAL
 ()
 [
     AutoUpdate = FALSE,
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 3b0d5cfc6265..64ba3ed7479c 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -222,7 +222,7 @@ interface FormulaView
         StateMethod = GetState ;
     ]
     //idlpp no menu entry, so no texts
-    SID_INSERTSYMBOL //idlpp ole : no , status : no
+    SID_INSERTSPECIAL //idlpp ole : no , status : no
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index e02ad89b86c6..3a92349c82f1 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1487,8 +1487,8 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl, Button*, void )
         OUString aText = "%" + pSym->GetName() + " ";
 
         rViewSh.GetViewFrame()->GetDispatcher()->ExecuteList(
-                SID_INSERTSYMBOL, SfxCallMode::RECORD,
-                { new SfxStringItem(SID_INSERTSYMBOL, aText) });
+                SID_INSERTSPECIAL, SfxCallMode::RECORD,
+                { new SfxStringItem(SID_INSERTSPECIAL, aText) });
     }
 }
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 11c5b7148488..0a5ef6970b07 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1561,10 +1561,10 @@ void SmViewShell::Execute(SfxRequest& rReq)
 
         }
 
-        case SID_INSERTSYMBOL:
+        case SID_INSERTSPECIAL:
         {
             const SfxStringItem& rItem =
-                static_cast<const SfxStringItem&>(rReq.GetArgs()->Get(SID_INSERTSYMBOL));
+                static_cast<const SfxStringItem&>(rReq.GetArgs()->Get(SID_INSERTSPECIAL));
 
             if (pWin && (mbInsertIntoEditWindow || !IsInlineEditEnabled()))
                 pWin->InsertText(rItem.GetValue());