diff options
author | Justin Luth <justin_luth@sil.org> | 2022-02-15 14:26:35 +0200 |
---|---|---|
committer | Justin Luth <jluth@mail.com> | 2022-02-24 07:36:57 +0100 |
commit | e87f9b4fa158b917bb38fc00513bae7f94024e58 (patch) | |
tree | 3b497b99bdba64c9f602981086426b78d810458c /include/svx/ruler.hxx | |
parent | dc4c55c51d52340c84e21da92d61d3488a253cd3 (diff) |
tdf#95882 svxruler: restore adjustment for borders
This restores the clause removed from
LO 3.6's commit 47a77d7dbc427e51421e2df8d59695834cb74980
Ruler: disable snapping, tooltips
[Because that removal left behind dead code,
which was later cleared out, of course this patch
restores that as well.
commit 8303e7ed668fbcbd0ba75bd9dd259f03073ffd46
Author: Noel Grandin on Fri Jun 14 10:41:11 2019 +0200
]
Basic borders on the paragraph itself
do not affect where LO ends the tabstop,
and thus the removal of that clause was partially justified.
But the table/frame/page/headers definitely need to be adjusted
in order for the tabstops to show in the correct position.
RightFrameMargin needed this as well,
especially now that RTL is supported by the ruler since LO 3.6,
although the Left/Right functions are very different.
[Frames never worked because the aCoreSet wasn't accepting
RES_BOX items. Interesting error considering all of the
other sections of code created a new CoreSet.]
Change-Id: Ic24839dbbd730e66d8b0d588bfbd73bc7cb260bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130125
Tested-by: Justin Luth <jluth@mail.com>
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'include/svx/ruler.hxx')
-rw-r--r-- | include/svx/ruler.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 374209a73f69..010af4b17936 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -91,6 +91,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener std::unique_ptr<SvxLongULSpaceItem> mxULSpaceItem; // upper and lower edge std::unique_ptr<SvxTabStopItem> mxTabStopItem; // tab stops std::unique_ptr<SvxLRSpaceItem> mxParaItem; // paragraphs + std::unique_ptr<SvxLRSpaceItem> mxBorderItem; // border distance std::unique_ptr<SvxPagePosSizeItem> mxPagePosItem; // page distance to the rule std::unique_ptr<SvxColumnItem> mxColumnItem; // columns std::unique_ptr<SvxObjectItem> mxObjectItem; // object @@ -140,7 +141,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener // paragraph indentations void UpdatePara(const SvxLRSpaceItem* pItem); // Border distance - void UpdateParaBorder(); + void UpdateBorder(const SvxLRSpaceItem* pItem); // Tabs void Update(const SvxTabStopItem* pItem); // page position and width |