tdf#126464 Remove "Numbering on/off" UNO command
Removed code where uno:NumberOrNoNumber or FN_NUM_OR_NONUM is mentioned
Didn't remove NumOrNoNum function as it is used in other places
Change-Id: I7809974796580e4d43ad203817d4225301c30536
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164175
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 0747863..b383eb1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2280,11 +2280,6 @@
<value xml:lang="en-US">To Next Sentence</value>
</prop>
</node>
<node oor:name=".uno:NumberOrNoNumber" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Numbering On/Off</value>
</prop>
</node>
<node oor:name=".uno:GoToPrevSentence" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">To Previous Sentence</value>
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 3e61100..2a7df32 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -103,8 +103,6 @@ class SwUINumRuleItem;
#define FN_NUM_BULLET_OUTLINE_MOVEDOWN (FN_EDIT + 42) /* Push down with sub-items */
#define FN_UPDATE_INPUTFIELDS (FN_EDIT + 43) /* Update input fields */
#define FN_NUM_OR_NONUM (FN_EDIT + 46) /* Number on/off */
#define FN_GOTO_NEXT_INPUTFLD (FN_EDIT + 47) /* go to next inputfield */
#define FN_GOTO_PREV_INPUTFLD (FN_EDIT + 48) /* go to previous inputfield */
#define FN_GOTO_MARK (FN_EDIT + 49) /* go to bookmark by name */
diff --git a/sw/sdi/_listsh.sdi b/sw/sdi/_listsh.sdi
index fc27094..33f42d7 100644
--- a/sw/sdi/_listsh.sdi
+++ b/sw/sdi/_listsh.sdi
@@ -80,12 +80,5 @@ interface BaseTextList
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
FN_NUM_OR_NONUM // status(play)
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
}
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 16d939a..03c949a 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -4821,24 +4821,6 @@ SfxBoolItem NumberingStart FN_NUMBER_NEWSTART
GroupId = SfxGroupId::Enumeration;
]
SfxBoolItem NumberOrNoNumber FN_NUM_OR_NONUM
[
AutoUpdate = FALSE,
FastCall = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
GroupId = SfxGroupId::Enumeration;
]
SfxVoidItem ObjectBackOne FN_FRAME_DOWN
()
[
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index f6100cc..0fe2175 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -126,7 +126,6 @@ static void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bU
void SwListShell::Execute(SfxRequest &rReq)
{
const SfxItemSet* pArgs = rReq.GetArgs();
const sal_uInt16 nSlot = rReq.GetSlot();
SwWrtShell& rSh = GetShell();
@@ -194,18 +193,6 @@ void SwListShell::Execute(SfxRequest &rReq)
rSh.GotoPrevNum();
rReq.Done();
break;
case FN_NUM_OR_NONUM:
{
bool bApi = rReq.IsAPI();
bool bDelete = !rSh.IsNoNum(!bApi);
if(pArgs )
bDelete = static_cast<const SfxBoolItem &>(pArgs->Get(rReq.GetSlot())).GetValue();
rSh.NumOrNoNum( bDelete, !bApi );
rReq.AppendItem( SfxBoolItem( nSlot, bDelete ) );
rReq.Done();
}
break;
default:
OSL_ENSURE(false, "wrong dispatcher");
return;
@@ -222,9 +209,6 @@ void SwListShell::GetState(SfxItemSet &rSet)
{
switch( nWhich )
{
case FN_NUM_OR_NONUM:
rSet.Put(SfxBoolItem(nWhich, GetShell().IsNoNum(false)));
break;
case FN_NUM_BULLET_OUTLINE_UP:
case FN_NUM_BULLET_UP:
if(!nCurrentNumLevel)
