sw/source/uibase/uiview/viewtab.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 900fb3b9aa1808796ee24ba9795096dec3e85a98
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Jul 13 17:58:07 2023 +0300
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Jul 26 14:48:30 2023 +0200
tdf#154035: use correct Which range including the new WIDs
After commit db115bec9254417ef7a3faf687478fe5424ab378 (tdf#78510 sw,cui:
split SvxLRSpaceItem for SwTextNode, SwTextFormatColl, 2023-02-24),
aCoreSet is now querying RES_MARGIN_FIRSTLINE, RES_MARGIN_TEXTLEFT,
RES_MARGIN_RIGHT instead of RES_LR_SPACE. Without the fix, it would
return wrong state, and disable the respective item in the cases of
SID_ATTR_TABSTOP_VERTICAL / RES_PARATR_TABSTOP, which disabled the
ruler.
Change-Id: I8ca4ce586b414cefe2be79ec0226ac7808a231d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154395
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit bfa25258d21430560584e3265cdd4629ee47a1b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154421
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sw/source/uibase/uiview/viewtab.cxx
b/sw/source/uibase/uiview/viewtab.cxx
index d99e27f7fb58..26bfba7b8b18 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1401,8 +1401,9 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SwapPageMargin( rDesc, aPageLRSpace );
SfxItemSetFixed<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP,
- RES_LR_SPACE, RES_UL_SPACE> aCoreSet( GetPool() );
- // get also the list level indent values merged as LR-SPACE item, if
needed.
+ RES_MARGIN_FIRSTLINE, RES_MARGIN_RIGHT,
+ RES_UL_SPACE, RES_UL_SPACE> aCoreSet( GetPool() );
+ // get also the list level indent values, if needed.
rSh.GetCurAttr( aCoreSet, true );
const SelectionType nSelType = rSh.GetSelectionType();
