Skip to content

C
core
Kaydet (Commit) 08209f2b authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

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/47369Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 9be88e72
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 76 deletions
include/editeng/editids.hrc
Dosyayı görüntüle @ 08209f2b
...@@ -138,8 +138,6 @@ ...@@ -138,8 +138,6 @@
#error Resource-Overflow in #line, #file #error Resource-Overflow in #line, #file
#endif #endif
#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL
#endif #endif
// ******************************************************************* EOF // ******************************************************************* EOF
......
include/sfx2/sfxsids.hrc
Dosyayı görüntüle @ 08209f2b
...@@ -550,41 +550,41 @@ ...@@ -550,41 +550,41 @@
// SlotIds for Basic ------------------------------------------------------- // SlotIds for Basic -------------------------------------------------------
#define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 ) #define SID_BASICIDE_TOGGLEBRKPNT ( SID_BASICIDE_START + 0 )
#define SID_BASICIDE_ADDWATCH ( SID_BASICIDE_START + 1 ) #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_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_EDITMACRO ( SID_BASICIDE_START + 3 )
#define SID_BASICIDE_HIDECURPAGE ( SID_BASICIDE_START + 10 ) #define SID_BASICIDE_CREATEMACRO ( SID_BASICIDE_START + 4 )
#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_MODULEDLG ( SID_BASICIDE_START + 5 ) #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_OBJCAT ( SID_BASICIDE_START + 6 )
#define SID_BASICIDE_REMOVEWATCH ( SID_BASICIDE_START + 7 ) #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_RENAMECURRENT ( SID_BASICIDE_START + 23 )
#define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 ) #define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 )
#define SID_BASICIDE_SBXINSERTED ( SID_BASICIDE_START + 25 ) #define SID_BASICIDE_SBXINSERTED ( SID_BASICIDE_START + 25 )
#define SID_BASICIDE_SBXRENAMED ( SID_BASICIDE_START + 26 ) #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_POS ( SID_BASICIDE_START + 38 )
#define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 ) #define SID_BASICIDE_STAT_DATE ( SID_BASICIDE_START + 39 )
#define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 ) #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_MANAGEBRKPNTS ( SID_BASICIDE_START + 42 )
#define SID_BASICIDE_TOGGLEBRKPNTENABLED ( SID_BASICIDE_START + 43 ) #define SID_BASICIDE_TOGGLEBRKPNTENABLED ( SID_BASICIDE_START + 43 )
#define SID_BASICIDE_SHOWWINDOW ( SID_BASICIDE_START + 44 ) #define SID_BASICIDE_SHOWWINDOW ( SID_BASICIDE_START + 44 )
...@@ -597,6 +597,7 @@ ...@@ -597,6 +597,7 @@
#define SID_BASICIDE_ARG_DOCUMENT_MODEL ( SID_BASICIDE_START + 51 ) #define SID_BASICIDE_ARG_DOCUMENT_MODEL ( SID_BASICIDE_START + 51 )
#define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 ) #define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 )
#define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 ) #define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 )
#define SID_OPTIONS_TREEDIALOG ( SID_BASICIDE_START + 862)
// SlotIds for Apps -------------------------------------------------------- // SlotIds for Apps --------------------------------------------------------
#define FN_PARAM (SID_SW_START + 1100) #define FN_PARAM (SID_SW_START + 1100)
...@@ -625,7 +626,6 @@ ...@@ -625,7 +626,6 @@
#define SID_MODIFIED (SID_SD_START+89) #define SID_MODIFIED (SID_SD_START+89)
#define ID_VAL_DUMMY0 (SID_SD_START+230) #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_SIZE_OPTIMAL (SID_SD_START+99)
#define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL) #define SID_ZOOM_OPTIMAL (SID_SIZE_OPTIMAL)
...@@ -644,7 +644,6 @@ ...@@ -644,7 +644,6 @@
#define FN_LABEL (SID_SW_START + 1051 ) #define FN_LABEL (SID_SW_START + 1051 )
#define FN_BUSINESS_CARD (SID_SW_START + 1052) #define FN_BUSINESS_CARD (SID_SW_START + 1052)
#define FN_XFORMS_INIT (SID_SW_START + 1053) #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) #define SID_RESTORE_EDITING_VIEW (SID_SFX_START + 1663)
......
include/svx/svxids.hrc
Dosyayı görüntüle @ 08209f2b
...@@ -96,47 +96,6 @@ class SvxLineItem; ...@@ -96,47 +96,6 @@ class SvxLineItem;
#define SID_EQUALIZEWIDTH (SID_SFX_START + 684) #define SID_EQUALIZEWIDTH (SID_SFX_START + 684)
#define SID_EQUALIZEHEIGHT (SID_SFX_START + 685) #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 // StarBase IDs
#define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // data in fields #define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // data in fields
......
starmath/inc/starmath.hrc
Dosyayı görüntüle @ 08209f2b
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#define SID_TEXT (SID_SMA_START + 100) #define SID_TEXT (SID_SMA_START + 100)
#define SID_GAPHIC_SM (SID_SMA_START + 101) #define SID_GAPHIC_SM (SID_SMA_START + 101)
/** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */ /** 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 */ /** Command for inserting a math construction */
#define SID_INSERTCOMMANDTEXT (SID_SMA_START + 106) #define SID_INSERTCOMMANDTEXT (SID_SMA_START + 106)
......
starmath/inc/view.hxx
Dosyayı görüntüle @ 08209f2b
...@@ -223,7 +223,7 @@ class SmViewShell: public SfxViewShell ...@@ -223,7 +223,7 @@ class SmViewShell: public SfxViewShell
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; 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 * should be inserted into SmEditWindow or directly into the SmDocShell as done if the
* visual editor was last to have focus. * visual editor was last to have focus.
*/ */
......
starmath/sdi/smath.sdi
Dosyayı görüntüle @ 08209f2b
...@@ -235,7 +235,7 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT ...@@ -235,7 +235,7 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
] ]
SfxVoidItem InsertConfigName SID_INSERTSYMBOL SfxVoidItem InsertConfigName SID_INSERTSPECIAL
() ()
[ [
AutoUpdate = FALSE, AutoUpdate = FALSE,
......
starmath/sdi/smslots.sdi
Dosyayı görüntüle @ 08209f2b
...@@ -222,7 +222,7 @@ interface FormulaView ...@@ -222,7 +222,7 @@ interface FormulaView
StateMethod = GetState ; StateMethod = GetState ;
] ]
//idlpp no menu entry, so no texts //idlpp no menu entry, so no texts
SID_INSERTSYMBOL //idlpp ole : no , status : no SID_INSERTSPECIAL //idlpp ole : no , status : no
[ [
ExecMethod = Execute ; ExecMethod = Execute ;
StateMethod = GetState ; StateMethod = GetState ;
......
starmath/source/dialog.cxx
Dosyayı görüntüle @ 08209f2b
...@@ -1487,8 +1487,8 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl, Button*, void ) ...@@ -1487,8 +1487,8 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl, Button*, void )
OUString aText = "%" + pSym->GetName() + " "; OUString aText = "%" + pSym->GetName() + " ";
rViewSh.GetViewFrame()->GetDispatcher()->ExecuteList( rViewSh.GetViewFrame()->GetDispatcher()->ExecuteList(
SID_INSERTSYMBOL, SfxCallMode::RECORD, SID_INSERTSPECIAL, SfxCallMode::RECORD,
{ new SfxStringItem(SID_INSERTSYMBOL, aText) }); { new SfxStringItem(SID_INSERTSPECIAL, aText) });
} }
} }
......
starmath/source/view.cxx
Dosyayı görüntüle @ 08209f2b
...@@ -1561,10 +1561,10 @@ void SmViewShell::Execute(SfxRequest& rReq) ...@@ -1561,10 +1561,10 @@ void SmViewShell::Execute(SfxRequest& rReq)
} }
case SID_INSERTSYMBOL: case SID_INSERTSPECIAL:
{ {
const SfxStringItem& rItem = 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())) if (pWin && (mbInsertIntoEditWindow || !IsInlineEditEnabled()))
pWin->InsertText(rItem.GetValue()); pWin->InsertText(rItem.GetValue());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment