Kaydet (Commit) 420a65c1 authored tarafından Noel Grandin's avatar Noel Grandin

Revert "unused SID command in starmath"

This reverts commit b9c6f2de.

Change-Id: Ice33baa738c025de72ceb11cf6746e017fb27484
Reviewed-on: https://gerrit.libreoffice.org/46964Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 1c7d3390
...@@ -42,12 +42,10 @@ for pair in commandSet: ...@@ -42,12 +42,10 @@ for pair in commandSet:
for line2 in txt2: for line2 in txt2:
foundLines = foundLines + line2 foundLines = foundLines + line2
if foundLines.find("ExecuteList") != -1: continue if foundLines.find("ExecuteList") != -1: continue
if foundLines.find("Dispatcher()->Execute") != -1: continue if foundLines.find("GetDispatcher()->Execute") != -1: continue
if foundLines.find("ExecuteScenarioSlot") != -1: continue if foundLines.find("ExecuteScenarioSlot") != -1: continue
# TODO not sure about this, but let's tackle the easy ones first # TODO not sure about this, but let's tackle the easy ones first
if foundLines.find("Invalidate(") != -1: continue if foundLines.find("Invalidate(") != -1: continue
if foundLines.find("SFX_IMPL_DOCKINGWINDOW_WITHID") != -1: continue
# dump any lines that contain the SID, so we can eyeball the results # dump any lines that contain the SID, so we can eyeball the results
print("remove: " + commandName) print("remove: " + commandName)
......
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
/** 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)
#define SID_LOADSYMBOLS (SID_SMA_START + 107)
#define SID_SAVESYMBOLS (SID_SMA_START + 108)
#define SID_MODIFYSTATUS (SID_SMA_START + 110) #define SID_MODIFYSTATUS (SID_SMA_START + 110)
#define SID_TEXTSTATUS (SID_SMA_START + 111) #define SID_TEXTSTATUS (SID_SMA_START + 111)
...@@ -62,6 +64,7 @@ ...@@ -62,6 +64,7 @@
#define SID_PASTEOBJECT (SID_SMA_START + 118) #define SID_PASTEOBJECT (SID_SMA_START + 118)
#define SID_AUTOREDRAW (SID_SMA_START + 119) #define SID_AUTOREDRAW (SID_SMA_START + 119)
#define SID_GETEDITTEXT (SID_SMA_START + 121)
#define SID_CMDBOXWINDOW (SID_SMA_START + 122) #define SID_CMDBOXWINDOW (SID_SMA_START + 122)
#define SID_NO_RIGHT_SPACES (SID_SMA_START + 124) #define SID_NO_RIGHT_SPACES (SID_SMA_START + 124)
#define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125) #define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125)
......
...@@ -289,6 +289,25 @@ SfxVoidItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD ...@@ -289,6 +289,25 @@ SfxVoidItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD
GroupId = SfxGroupId::Insert; GroupId = SfxGroupId::Insert;
] ]
SfxVoidItem LoadSymbols SID_LOADSYMBOLS
()
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Asynchron;
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Options;
]
SfxStringItem ModifyStatus SID_MODIFYSTATUS SfxStringItem ModifyStatus SID_MODIFYSTATUS
[ [
...@@ -416,6 +435,43 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW ...@@ -416,6 +435,43 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW
GroupId = SfxGroupId::View; GroupId = SfxGroupId::View;
] ]
SfxVoidItem SaveSymbols SID_SAVESYMBOLS
()
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Options;
]
SfxVoidItem SetPaperSize SID_GETEDITTEXT
()
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = SfxGroupId::Math;
]
SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE
() ()
[ [
......
...@@ -55,6 +55,18 @@ interface FormulaDocument ...@@ -55,6 +55,18 @@ interface FormulaDocument
ExecMethod = Execute ; ExecMethod = Execute ;
StateMethod = GetState ; StateMethod = GetState ;
] ]
//idlpp no menu entry, so no texts
SID_LOADSYMBOLS //idlpp ole : no , status : no
[
ExecMethod = Execute ;
StateMethod = GetState ;
]
//idlpp no menu entry, so no texts
SID_SAVESYMBOLS //idlpp ole : no , status : no
[
ExecMethod = Execute ;
StateMethod = GetState ;
]
SID_FONT //idlpp ole : no , status : no SID_FONT //idlpp ole : no , status : no
[ [
ExecMethod = Execute ; ExecMethod = Execute ;
...@@ -245,6 +257,12 @@ interface FormulaView ...@@ -245,6 +257,12 @@ interface FormulaView
StateMethod = GetState ; StateMethod = GetState ;
] ]
//idlpp no menu entry, so no texts //idlpp no menu entry, so no texts
SID_GETEDITTEXT //idlpp ole : no , status : no
[
ExecMethod = Execute ;
StateMethod = GetState ;
]
//idlpp no menu entry, so no texts
SID_CMDBOXWINDOW //idlpp ole : no , status : no SID_CMDBOXWINDOW //idlpp ole : no , status : no
[ [
ExecMethod = NoExec ; ExecMethod = NoExec ;
......
...@@ -915,6 +915,14 @@ void SmDocShell::Execute(SfxRequest& rReq) ...@@ -915,6 +915,14 @@ void SmDocShell::Execute(SfxRequest& rReq)
} }
break; break;
case SID_LOADSYMBOLS:
LoadSymbols();
break;
case SID_SAVESYMBOLS:
SaveSymbols();
break;
case SID_FONT: case SID_FONT:
{ {
// get device used to retrieve the FontList // get device used to retrieve the FontList
......
...@@ -1694,6 +1694,11 @@ void SmViewShell::Execute(SfxRequest& rReq) ...@@ -1694,6 +1694,11 @@ void SmViewShell::Execute(SfxRequest& rReq)
break; break;
} }
case SID_GETEDITTEXT:
if (pWin)
if (!pWin->GetText().isEmpty()) GetDoc()->SetText( pWin->GetText() );
break;
case SID_ATTR_ZOOM: case SID_ATTR_ZOOM:
{ {
if ( !GetViewFrame()->GetFrame().IsInPlace() ) if ( !GetViewFrame()->GetFrame().IsInPlace() )
......
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