include/editeng/editids.hrc | 2 -
include/sfx2/sfxsids.hrc | 49 +++++++++++++++++++++-----------------------
include/svx/svxids.hrc | 41 ------------------------------------
starmath/inc/starmath.hrc | 2 -
starmath/inc/view.hxx | 2 -
starmath/sdi/smath.sdi | 2 -
starmath/sdi/smslots.sdi | 2 -
starmath/source/dialog.cxx | 4 +--
starmath/source/view.cxx | 4 +--
9 files changed, 32 insertions(+), 76 deletions(-)
New commits:
commit 08209f2b67cf84b96dd03c90d87bc2d8dad26c8c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Thu Jan 4 10:21:24 2018 +0200
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 <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index f728255f4285..5921eff49866 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -138,8 +138,6 @@
#error Resource-Overflow in #line, #file
#endif
-#define SID_DRAW_TEXT_VERTICAL
SID_ATTR_CHAR_VERTICAL
-
#endif
// ******************************************************************* EOF
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 995f3641a744..8ded365cdc6e 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -550,41 +550,41 @@
// SlotIds for Basic -------------------------------------------------------
#define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 )
#define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 )
-#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
-#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 )
#define SID_BASICIDE_CHOOSEMACRO ( SID_BASICIDE_START + 2 )
-#define SID_BASICIDE_CREATEMACRO ( SID_BASICIDE_START + 4 )
-#define SID_BASICIDE_DELETECURRENT ( SID_BASICIDE_START + 22 )
#define SID_BASICIDE_EDITMACRO ( SID_BASICIDE_START + 3 )
-#define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 )
-#define SID_BASICIDE_LIBLOADED ( SID_BASICIDE_START + 27 )
-#define SID_BASICIDE_LIBSELECTOR ( SID_BASICIDE_START + 19 )
-#define SID_BASICIDE_LIBSELECTED ( SID_BASICIDE_START + 18 )
-#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 )
-#define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 )
-#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 )
+#define SID_BASICIDE_CREATEMACRO ( SID_BASICIDE_START + 4 )
#define SID_BASICIDE_MODULEDLG ( SID_BASICIDE_START + 5 )
-#define SID_BASICIDE_NAMECHANGEDONTAB ( SID_BASICIDE_START + 11 )
-#define SID_BASICIDE_ARG_TABID ( SID_BASICIDE_START + 30 )
-#define SID_BASICIDE_ARG_MACROINFO ( SID_BASICIDE_START + 32 )
-#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 )
-#define SID_BASICIDE_ARG_SBX ( SID_BASICIDE_START + 31 )
-#define SID_BASICIDE_NEWMODULE ( SID_BASICIDE_START + 21 )
-#define SID_BASICIDE_NEWDIALOG ( SID_BASICIDE_START + 20 )
#define SID_BASICIDE_OBJCAT ( SID_BASICIDE_START + 6 )
#define SID_BASICIDE_REMOVEWATCH ( SID_BASICIDE_START + 7 )
+#define SID_BASICIDE_SHOWSBX ( SID_BASICIDE_START + 9 )
+#define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 )
+#define SID_BASICIDE_NAMECHANGEDONTAB ( SID_BASICIDE_START + 11 )
+#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 )
+#define SID_BASICIDE_STOREMODULESOURCE ( SID_BASICIDE_START + 13 )
+#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 )
+#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
+#define SID_BASICIDE_STOREALLMODULESOURCES ( SID_BASICIDE_START + 16 )
+#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 )
+#define SID_BASICIDE_LIBSELECTED ( SID_BASICIDE_START + 18 )
+#define SID_BASICIDE_LIBSELECTOR ( SID_BASICIDE_START + 19 )
+#define SID_BASICIDE_NEWDIALOG ( SID_BASICIDE_START + 20 )
+#define SID_BASICIDE_NEWMODULE ( SID_BASICIDE_START + 21 )
+#define SID_BASICIDE_DELETECURRENT ( SID_BASICIDE_START + 22 )
#define SID_BASICIDE_RENAMECURRENT ( SID_BASICIDE_START + 23 )
#define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 )
#define SID_BASICIDE_SBXINSERTED ( SID_BASICIDE_START + 25 )
#define SID_BASICIDE_SBXRENAMED ( SID_BASICIDE_START + 26 )
-#define SID_BASICIDE_SHOWSBX ( SID_BASICIDE_START + 9 )
+#define SID_BASICIDE_LIBLOADED ( SID_BASICIDE_START + 27 )
+#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 )
+#define SID_BASICIDE_ARG_TABID ( SID_BASICIDE_START + 30 )
+#define SID_BASICIDE_ARG_SBX ( SID_BASICIDE_START + 31 )
+#define SID_BASICIDE_ARG_MACROINFO ( SID_BASICIDE_START + 32 )
+#define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 )
+#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 )
+#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 )
#define SID_BASICIDE_STAT_POS ( SID_BASICIDE_START + 38 )
#define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 )
#define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 )
-#define SID_BASICIDE_STOREMODULESOURCE ( SID_BASICIDE_START + 13 )
-#define SID_BASICIDE_STOREALLMODULESOURCES ( SID_BASICIDE_START + 16 )
-#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 )
-#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 )
#define SID_BASICIDE_MANAGEBRKPNTS ( SID_BASICIDE_START + 42 )
#define SID_BASICIDE_TOGGLEBRKPNTENABLED ( SID_BASICIDE_START + 43 )
#define SID_BASICIDE_SHOWWINDOW ( SID_BASICIDE_START + 44 )
@@ -597,6 +597,7 @@
#define SID_BASICIDE_ARG_DOCUMENT_MODEL ( SID_BASICIDE_START + 51 )
#define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 )
#define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 )
+#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862)
// SlotIds for Apps --------------------------------------------------------
#define FN_PARAM (SID_SW_START + 1100)
@@ -625,7 +626,6 @@
#define SID_MODIFIED (SID_SD_START+89)
#define ID_VAL_DUMMY0 (SID_SD_START+230)
-#define ID_VAL_ZOOM (SID_SD_START+234)
#define SID_SIZE_OPTIMAL (SID_SD_START+99)
#define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL)
@@ -644,7 +644,6 @@
#define FN_LABEL (SID_SW_START + 1051 )
#define FN_BUSINESS_CARD (SID_SW_START + 1052)
#define FN_XFORMS_INIT (SID_SW_START + 1053)
-#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862)
#define SID_RESTORE_EDITING_VIEW (SID_SFX_START + 1663)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 07e808c37627..8ebc442ed764 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -96,47 +96,6 @@ class SvxLineItem;
#define SID_EQUALIZEWIDTH (SID_SFX_START + 684)
#define SID_EQUALIZEHEIGHT (SID_SFX_START + 685)
-// basic IDE IDs
-
-#define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 )
-#define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 )
-#define SID_BASICIDE_CHOOSEMACRO ( SID_BASICIDE_START + 2 )
-#define SID_BASICIDE_EDITMACRO ( SID_BASICIDE_START + 3 )
-#define SID_BASICIDE_CREATEMACRO ( SID_BASICIDE_START + 4 )
-#define SID_BASICIDE_MODULEDLG ( SID_BASICIDE_START + 5 )
-#define SID_BASICIDE_OBJCAT ( SID_BASICIDE_START + 6 )
-#define SID_BASICIDE_REMOVEWATCH ( SID_BASICIDE_START + 7 )
-#define SID_BASICIDE_SHOWSBX ( SID_BASICIDE_START + 9 )
-#define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 )
-#define SID_BASICIDE_NAMECHANGEDONTAB ( SID_BASICIDE_START + 11 )
-#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 )
-#define SID_BASICIDE_STOREMODULESOURCE ( SID_BASICIDE_START + 13 )
-#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 )
-#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
-#define SID_BASICIDE_STOREALLMODULESOURCES ( SID_BASICIDE_START + 16 )
-#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 )
-#define SID_BASICIDE_LIBSELECTED ( SID_BASICIDE_START + 18 )
-#define SID_BASICIDE_LIBSELECTOR ( SID_BASICIDE_START + 19 )
-#define SID_BASICIDE_NEWDIALOG ( SID_BASICIDE_START + 20 )
-#define SID_BASICIDE_NEWMODULE ( SID_BASICIDE_START + 21 )
-#define SID_BASICIDE_DELETECURRENT ( SID_BASICIDE_START + 22 )
-#define SID_BASICIDE_RENAMECURRENT ( SID_BASICIDE_START + 23 )
-#define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 )
-#define SID_BASICIDE_SBXINSERTED ( SID_BASICIDE_START + 25 )
-#define SID_BASICIDE_SBXRENAMED ( SID_BASICIDE_START + 26 )
-#define SID_BASICIDE_LIBLOADED ( SID_BASICIDE_START + 27 )
-#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 )
-#define SID_BASICIDE_ARG_TABID ( SID_BASICIDE_START + 30 )
-#define SID_BASICIDE_ARG_SBX ( SID_BASICIDE_START + 31 )
-#define SID_BASICIDE_ARG_MACROINFO ( SID_BASICIDE_START + 32 )
-#define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 )
-#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 )
-#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 )
-#define SID_BASICIDE_STAT_POS ( SID_BASICIDE_START + 38 )
-#define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 )
-#define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 )
-#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862)
-
// StarBase IDs
#define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // data in
fields
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());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
