diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-08-05 14:36:19 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-14 09:29:43 +0200 |
| commit | 1b9d52949239f0dd2e982ae986dcb812085eee03 (patch) | |
| tree | b1263bc0555c24135dacb64bf5c94f1cce8f3b4d /cui | |
| parent | tdf#126848: sc pivot table popup: avoid flicker (diff) | |
| download | core-1b9d52949239f0dd2e982ae986dcb812085eee03.tar.gz core-1b9d52949239f0dd2e982ae986dcb812085eee03.zip | |
tdf#126684: store "DialogUseCharAttr" in RES_PARATR_GRABBAG
... because RES_CHRATR_GRABBAG value may be later reset by initial
value read from char format, when it's present there.
OTOH, RES_PARATR_GRABBAG shouldn't be present in character format,
so it should be safe to pass the grabbag item there.
Regression after commit 074fc4a1499aac6eb67cd0b2dca00a51071cff0e.
Change-Id: Iebbee04929714d6a3fb72274a211699b2a80b3d2
Reviewed-on: https://gerrit.libreoffice.org/76981
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 30d03b495f437e9b2edbb0f8ceebe3020ba7459c)
Reviewed-on: https://gerrit.libreoffice.org/77016
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/border.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index a0449ef7379c..5777a0e3c1cc 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -489,7 +489,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor FillLineListBox_Impl(); // connections - if (rCoreAttrs.HasItem(GetWhich(SID_ATTR_CHAR_GRABBAG), &pItem)) + if (rCoreAttrs.HasItem(GetWhich(SID_ATTR_PARA_GRABBAG), &pItem)) { const SfxGrabBagItem* pGrabBag = static_cast<const SfxGrabBagItem*>(pItem); auto it = pGrabBag->GetGrabBag().find("DialogUseCharAttr"); |