diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-05-28 23:05:28 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-07 14:39:56 +0000 |
| commit | c5607ee9ab4a55521c5a72a015c3c5f371fccfc3 (patch) | |
| tree | 18750b001113e522b08853250df4338e041e99d9 | |
| parent | f8187a37122c7847fe80d2ba687b67e36ba60d4a (diff) | |
fdo#78737: sw: fix setting tab stops via ruler
The SvxRuler binds the SID_ATTR_PARA_LRSPACE, and its indents and the
positions of tab stops depend on the values it gets from there; in LO
4.0 the value came from the SwView::StateTabWin() but now it comes from
SwTextShell::GetAttrState(), and the difference is that the former does
a special request to get the NumRule indents as LR-space.
(regression from d02f75a8c36705924ddd6a5921fe3012fafce812)
Change-Id: I548ce188655555f2473cb3973ce7aeb927d1a404
(cherry picked from commit 7c8b2f10310f0f64b111afb3012e82e9c4a690ac)
Reviewed-on: https://gerrit.libreoffice.org/9538
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit f9d5d1a7dabb73b16b6528217a26924feb08c1b7)
Reviewed-on: https://gerrit.libreoffice.org/9562
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 706df6231e60..7c71cdecf343 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -506,7 +506,9 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) SwWrtShell &rSh = GetShell(); SfxItemPool& rPool = GetPool(); SfxItemSet aCoreSet(rPool, aTxtFmtCollSetRange); - rSh.GetCurAttr(aCoreSet); // Request *all* text attributes from the core. + // Request *all* text attributes from the core. + // fdo#78737: this is called from SvxRuler, which requires the list indents! + rSh.GetCurAttr(aCoreSet, /* bMergeIndentValuesOfNumRule = */ true); SfxWhichIter aIter(rSet); sal_uInt16 nSlot = aIter.FirstWhich(); |