diff options
| author | Anshu <anshukhare50@gmail.com> | 2021-01-06 15:04:16 +0530 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2021-02-17 16:36:13 +0100 |
| commit | c456f839a597f537f1c59becd7d0bb6c86248ef8 (patch) | |
| tree | f82ec202f4424d43d500ced0d05456452ec9c303 /sw/source | |
| parent | 7a56d57acf3bfe148afbd461089343a9603e162b (diff) | |
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@documentfoundation.org>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/shells/listsh.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textsh1.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/shells/txtnum.cxx | 12 |
3 files changed, 17 insertions, 10 deletions
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: { |