[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sd/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Jul 13 17:14:12 UTC 2018


 sd/source/ui/view/drtxtob.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit bee7d89904b1547185e1e7be4fb731d7fe7d8563
Author:     Ilhan Yesil <ilhanyesil at gmx.de>
AuthorDate: Fri Jun 8 10:49:41 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jul 13 19:13:46 2018 +0200

    tdf#118063 Impress: Deselected spacing remained checked
    
    The state of the attributes for spacing are now read and set
    correctly.
    
    Change-Id: I661c00e247b55c64ea39c03db77dab9fa0775852
    Reviewed-on: https://gerrit.libreoffice.org/55455
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5b72382516d94bc27321461297ded92f8af8112d)
    Reviewed-on: https://gerrit.libreoffice.org/57388
    Tested-by: Jenkins

diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index ad3bb02d0c16..f31169e959dd 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -567,12 +567,18 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
         {
             case 100:
                 rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, true ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, false ) );
             break;
             case 150:
                 rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, true ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, false ) );
             break;
             case 200:
                 rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, true ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, false ) );
+                rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, false ) );
             break;
         }
     }


More information about the Libreoffice-commits mailing list