[Libreoffice-commits] core.git: Changes to 'private/mst/sw_redlinehide_4a'

[Libreoffice Gerrit user]

New branch 'private/mst/sw_redlinehide_4a' available with the following commits:
commit dce4a9caa1e4837c007732835a50b900a5ac13d8
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Nov 16 18:55:37 2018 +0100

    need some annoying custom set merge here, to handle different
    
    items differently.
    
    Change-Id: I89da8fc3272f6126573992bd54bfc5b8bef3de1d

commit be959ea861c99b3e550e3c7ba3101fa0d5aa2218
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Nov 16 18:52:32 2018 +0100

    add layout to GetParaAttr
    
    Change-Id: I4cbab55bc3b0f8bc6dc5bd3577da53b3160018a3

commit 35df0c6dcb3448300408128e69781cf3f301b8f3
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Nov 16 16:45:20 2018 +0100

    rename to GetParaAttr, at least that's unique
    
    Change-Id: I1de6b544a4868f0d30077ba2c6d195bffd2e8b00

commit 9a7d363aea1f02c01312facb11794f1b96b4be4a
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Nov 16 16:44:41 2018 +0100

    simplify SwTextNode::GetAttr()
    
    Change-Id: I78d32031ebc42d749dbc750b7127983810bbfb1d

commit ff2bb69d5b3896cd37f36d9db272d4949c5d2af4
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Nov 16 16:26:38 2018 +0100

    sw: SwTextNode::GetAttr() inconsistency
    
    If there are hints, the aFormatSet.Differentiate(rSet) will cause the
    pre-existing items in the parameter rSet to win, whereas without hints
    the SwContentNode::GetAttr() calls rSet.Set() which clears everything.
    
    It looks like WW8Export::WriteFootnoteBegin() was sort of relying on
    this; presumably it wants the pCFormat to win over node's items but
    hints on the position to win over pCFormat.  Well that's what it
    currently gets anyway, so try to preserve that.
    
    Change-Id: I80e18e040413fcf26f6f77844ed731de31a464d2