diff options
author | Justin Luth <justin_luth@sil.org> | 2021-12-16 08:51:55 +0200 |
---|---|---|
committer | Justin Luth <jluth@mail.com> | 2021-12-21 09:54:57 +0100 |
commit | d181d828d9a3490cefc3a9b41fbda2d5b07b08c3 (patch) | |
tree | 03f99f6795b8f3c5a53b9798edcb0c7349201ed8 /sd | |
parent | 86f539a23b08d0cc9e5e9566ac31380e373be13f (diff) |
tdf#133713 sd: bullets and numbering should enable it
This fixes a LO 6.3 regression caused by re-working
the numbering dialog (switching from FuOutlineBullet
to the new FuBulletAndPosition).
When running uno:OutlineBullet, one expects to have
numbering applied to the selection. However, that part
was completely omitted from the new implementation.
I can't imagine why, since most everything else in the
nearby code was just a copy/paste from the old methods.
This patch restores some of the logic from the old function.
[Deleted in commit 5ff162bede44b77cb19e5ff6571b6e34f228d9fb
Author: Gül?ah Köse on Mon May 27 23:49:41 2019 +0300
tdf#120905 Remove old FuOutlineBullet dialog code.]
Partially revert loplugin:unusedmethods to recover EnableBullets()
from commit cae829e9c1394851fc88829d5197460929c2792a
This fixes Format -> Bullets and Numbering,
right-click pop-up Bullets and Numbering,
and sidebar's Toggle * List's "More Numbering".
Change-Id: Iee3b66bd715e92167c9423242627a996191dcb72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126904
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 12832284318125b8649f6a67e3aa12aa953afdfb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127176
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 6c6b9aef5b0f..054a44e9b8a3 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -91,6 +91,19 @@ void FuBulletAndPosition::DoExecute( SfxRequest& rReq ) if( nResult == RET_OK ) { + OutlinerView* pOLV = pView->GetTextEditOutlinerView(); + + std::unique_ptr<OutlineViewModelChangeGuard, o3tl::default_delete<OutlineViewModelChangeGuard>> aGuard; + + if (OutlineView* pOutlineView = dynamic_cast<OutlineView*>(pView)) + { + pOLV = pOutlineView->GetViewByWindow(mpViewShell->GetActiveWindow()); + aGuard.reset(new OutlineViewModelChangeGuard(*pOutlineView)); + } + + if( pOLV ) + pOLV->EnsureNumberingIsOn(); + const SfxItemSet pOutputSet( *pDlg->GetOutputItemSet( &aNewAttr ) ); pView->SetAttributes(pOutputSet, /*bReplaceAll=*/false, /*bSlide*/ pDlg->IsSlideScope(), /*bMaster=*/pDlg->IsApplyToMaster()); } |