[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Michael Stahl]

 sw/source/ui/shells/txtattr.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f9d5d1a7dabb73b16b6528217a26924feb08c1b7
Author: Michael Stahl <mstahl at 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
    (cherry picked from commit 7c8b2f10310f0f64b111afb3012e82e9c4a690ac)
    Reviewed-on: https://gerrit.libreoffice.org/9538
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx
index 706df62..7c71cde 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();