sw/source/uibase/shells/txtattr.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 7c8b2f10310f0f64b111afb3012e82e9c4a690ac
Author: Michael Stahl <mst...@redhat.com>
Date: Wed May 28 23:05:28 2014 +0200
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
diff --git a/sw/source/uibase/shells/txtattr.cxx
b/sw/source/uibase/shells/txtattr.cxx
index 3b62eaa..daa02bb 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -492,7 +492,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
