[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

[Michael Stahl]

 sd/source/ui/func/fuchar.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7b56e04b296d112d13f60a80c4ddf1783eed26ba
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 31 14:45:17 2016 +0200

    sd: fix un-sorted SidArray in FuChar::DoExecute()
    
    Triggers an assert in SfxBindings::Invalidate().
    
    (regression from ecc7308efa973fd1f1985ff9a0a0f01414b73f2b)
    
    Change-Id: Ida5b6c006ef6b8a839962c4f09c8341eee980270
    (cherry picked from commit 52bac50deb628cb21c88d5dcab032d4980bb8974)
    Reviewed-on: https://gerrit.libreoffice.org/28550
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 0fbd9dd..cd02f20 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -143,11 +143,11 @@ void FuChar::DoExecute( SfxRequest& rReq )
                     SID_ATTR_CHAR_UNDERLINE,
                     SID_ATTR_CHAR_FONTHEIGHT,
                     SID_ATTR_CHAR_COLOR,
-                    SID_ATTR_CHAR_BACK_COLOR,
                     SID_ATTR_CHAR_KERNING,
                     SID_ATTR_CHAR_CASEMAP,
                     SID_SET_SUPER_SCRIPT,
                     SID_SET_SUB_SCRIPT,
+                    SID_ATTR_CHAR_BACK_COLOR,
                     0 };
 
     mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );