[Libreoffice-commits] core.git: officecfg/registry svx/uiconfig sw/sdi sw/source sw/uiconfig
Anshu (via logerrit)
logerrit at kemper.freedesktop.org
Wed Feb 17 15:36:52 UTC 2021
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 2 -
svx/uiconfig/ui/sidebarparagraph.ui | 11 +++++++++
sw/sdi/_listsh.sdi | 7 -----
sw/sdi/_textsh.sdi | 6 +++++
sw/source/uibase/shells/listsh.cxx | 10 --------
sw/source/uibase/shells/textsh1.cxx | 5 ++++
sw/source/uibase/shells/txtnum.cxx | 12 ++++++++++
sw/uiconfig/swriter/menubar/menubar.xml | 9 ++++---
sw/uiconfig/swriter/toolbar/textobjectbar.xml | 1
9 files changed, 41 insertions(+), 22 deletions(-)
New commits:
commit c456f839a597f537f1c59becd7d0bb6c86248ef8
Author: Anshu <anshukhare50 at gmail.com>
AuthorDate: Wed Jan 6 15:04:16 2021 +0530
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Feb 17 16:36:13 2021 +0100
tdf#115965 tdf#92622 NoList default in menu,tool,sidebar
Change-Id: Icbc612b44593c5366f3e7f81112f4013884f3599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108841
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze at 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 7450d72396d9..55b894ca85ea 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1953,7 +1953,7 @@
</node>
<node oor:name=".uno:RemoveBullets" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Numbering Off</value>
+ <value xml:lang="en-US">No List</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 846dbe53a409..716b03d9c5a9 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -641,6 +641,17 @@
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<property name="icon_size">2</property>
+ <child>
+ <object class="GtkToolButton" id=".uno:RemoveBullets">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
<child>
<object class="GtkMenuToolButton" id=".uno:DefaultBullet">
<property name="visible">True</property>
diff --git a/sw/sdi/_listsh.sdi b/sw/sdi/_listsh.sdi
index a2835d575bf6..fc27094f7a24 100644
--- a/sw/sdi/_listsh.sdi
+++ b/sw/sdi/_listsh.sdi
@@ -39,13 +39,6 @@ interface BaseTextList
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- FN_NUM_BULLET_OFF // status(final|play)
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
- ]
-
FN_NUM_BULLET_OUTLINE_DOWN // status(final|play)
[
ExecMethod = Execute ;
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index e0bcfff65360..4a201b62c7e1 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -759,6 +759,12 @@ interface BaseText
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+ FN_NUM_BULLET_OFF
+ [
+ ExecMethod = ExecEnterNum;
+ StateMethod = GetState;
+ DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+ ]
FN_INSERT_FRAME // status(final|play)
[
ExecMethod = ExecInsert ;
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 8220f6cd4ef1..cb37bfa08402 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -157,16 +157,6 @@ void SwListShell::Execute(SfxRequest &rReq)
rReq.Done();
break;
- case FN_NUM_BULLET_OFF:
- {
- rReq.Ignore();
- SfxRequest aReq( GetView().GetViewFrame(), FN_NUM_BULLET_ON );
- aReq.AppendItem( SfxBoolItem( FN_PARAM_1, false ) );
- aReq.Done();
- rSh.DelNumRules();
- break;
- }
-
case FN_NUM_BULLET_OUTLINE_DOWN:
if ( bOutline )
lcl_OutlineUpDownWithSubPoints( rSh, false, false );
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index c191d4c90f86..9535ceef1fa9 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -2036,6 +2036,11 @@ void SwTextShell::GetState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON,rSh.SelectionHasBullet()));
break;
+ case FN_NUM_BULLET_OFF:
+ rSet.Put(SfxBoolItem(FN_NUM_BULLET_OFF,(!rSh.SelectionHasBullet() &&
+ !rSh.SelectionHasNumber())));
+ break;
+
case FN_BUL_NUM_RULE_INDEX:
case FN_NUM_NUM_RULE_INDEX:
case FN_OUTLINE_RULE_INDEX:
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index 3feff416724b..8f8ca2429513 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -104,6 +104,18 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
}
break;
+ case FN_NUM_BULLET_OFF:
+ {
+ GetShell().StartAllAction();
+ SfxRequest aReq(GetView().GetViewFrame(), FN_NUM_BULLET_ON);
+ aReq.AppendItem(SfxBoolItem(FN_PARAM_1, false));
+ aReq.Done();
+ GetShell().NumOrBulletOff();
+ GetShell().DelNumRules();
+ GetShell().EndAllAction();
+ }
+ break;
+
case FN_NUMBER_BULLETS:
case SID_OUTLINE_BULLET:
{
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 4ec0436d48fe..42a7160734c7 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -424,8 +424,9 @@
</menu:menu>
<menu:menu menu:id=".uno:FormatBulletsMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:DefaultBullet"/>
- <menu:menuitem menu:id=".uno:DefaultNumbering"/>
+ <menu:menuitem menu:id=".uno:RemoveBullets" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:DefaultBullet" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:DefaultNumbering" menu:style="radio"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:DecrementLevel"/>
<menu:menuitem menu:id=".uno:IncrementLevel"/>
@@ -439,7 +440,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertNeutralParagraph"/>
<menu:menuitem menu:id=".uno:NumberingStart"/>
- <menu:menuitem menu:id=".uno:RemoveBullets"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:JumpDownThisLevel"/>
<menu:menuitem menu:id=".uno:JumpUpThisLevel"/>
@@ -579,6 +579,7 @@
<menu:menuitem menu:id=".uno:QuoteCharStyle" menu:style="radio"/>
<menu:menuitem menu:id=".uno:SourceCharStyle" menu:style="radio"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:RemoveBullets" menu:style="radio"/>
<menu:menuitem menu:id=".uno:BulletListStyle" menu:style="radio"/>
<menu:menuitem menu:id=".uno:NumberListStyle" menu:style="radio"/>
<menu:menuitem menu:id=".uno:AlphaListStyle" menu:style="radio"/>
@@ -818,4 +819,4 @@
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
</menu:menu>
-</menu:menubar>
+</menu:menubar>
\ No newline at end of file
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 49056f22580e..08d9914a502a 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -64,6 +64,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:DefaultBullet"/>
<toolbar:toolbaritem xlink:href=".uno:DefaultNumbering"/>
+ <toolbar:toolbaritem xlink:href=".uno:RemoveBullets"/>
<toolbar:toolbaritem xlink:href=".uno:SetOutline" toolbar:visible="false"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:IncrementIndent"/>
More information about the Libreoffice-commits
mailing list